This can safely be reverted once Gee 0.8.4 is released.
=========================================================
Dependencies:
-• libgee ≥ 0.8.4
+• libgee ≥ 0.8.3
Major changes:
• Added an ofono backend
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
- AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
this._local_ids_ro = this._local_ids.read_only_view;
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
this._email_addresses_ro = this._email_addresses.read_only_view;
this._groups = new HashSet<string> ();
this._groups_ro = this._groups.read_only_view;
private void _update_web_services_addresses ()
{
var new_services = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS");
if (services != null)
{
var im_eds_map = Persona._get_im_eds_map ();
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
- null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
foreach (var im_proto in im_eds_map.get_keys ())
{
/* Add the new IM addresses to the key file and build a normalised
* table of them to set as the new property value */
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
foreach (var protocol2 in im_addresses.get_keys ())
{
* table of them to set as the new property value */
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
foreach (var web_service2 in web_service_addresses.get_keys ())
{
this.iid, this.display_id);
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
this._anti_links = new HashSet<string> ();
this._anti_links_ro = this._anti_links.read_only_view;
* doesn't as it's a linkable property, so always has to be loaded anyway. */
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
- AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
/**
* A mapping of IM protocol to an (unordered) set of IM addresses.
EBOOK_REQUIRED=3.5.3
EDATASERVER_REQUIRED=3.5.3.1
ZEITGEIST_REQUIRED=0.3.14
-GEE_REQUIRED=0.8.4
+GEE_REQUIRED=0.8.3
AC_SUBST([TRACKER_SPARQL_MAJOR])
{
/* ``protocols_addrs_set`` will be passed to the new Kf.Persona */
var protocols_addrs_set = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
var web_service_addrs_set =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
/* List of local_ids */
var local_ids = new Gee.HashSet<string> ();
() =>
{
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
{
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ (Gee.HashDataFunc)
+ AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc)
+ AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ (Gee.HashDataFunc)
+ AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc)
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
{
v1 = Value (typeof (MultiMap));
var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS)
im_addrs1.set ("jabber",
new ImFieldDetails (this._auto_linkable_email));
{
v1 = Value (typeof (MultiMap));
var wsa1 = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
wsa1.set ("twitter", new WebServiceFieldDetails (this._im_address_1));
v1.set_object (wsa1);
details1.insert (wsk, (owned) v1);
{
v3 = Value (typeof (MultiMap));
var im_addrs2 = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
im_addrs2.set ("yahoo", new ImFieldDetails (this._im_address_2));
v3.set_object (im_addrs2);
details2.insert ("im-addresses", (owned) v3);
{
v3 = Value (typeof (MultiMap));
var wsa2 = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc) AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc) AbstractFieldDetails<string>.equal_static);
wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2));
v3.set_object (wsa2);
details2.insert (wsk, (owned) v3);
foreach (var p in i.personas)
{
var im_addrs = new HashMultiMap<string, ImFieldDetails> (
- null, null, AbstractFieldDetails<string>.hash_static,
- AbstractFieldDetails<string>.equal_static);
+ null, null,
+ (Gee.HashDataFunc)
+ AbstractFieldDetails<string>.hash_static,
+ (Gee.EqualDataFunc)
+ AbstractFieldDetails<string>.equal_static);
im_addrs.set ("jabber",
new ImFieldDetails ("bernie@example.org"));
((ImDetails) p).im_addresses = im_addrs;