From e069bbe59dc54eb3595d8ee5c96aea4a36cff9aa Mon Sep 17 00:00:00 2001 From: Jeremy Whiting Date: Wed, 4 Jul 2012 13:11:48 -0600 Subject: [PATCH] Port folks to libgee 0.8. Added hash_static and equal_static to AbstractFieldDetails. Use AbstractFieldDetails hash_static and equal_static where needed. --- backends/eds/lib/edsf-persona.vala | 60 +++++++++++----------- backends/key-file/kf-persona.vala | 15 +++--- backends/libsocialweb/lib/swf-persona.vala | 11 ++-- .../telepathy/lib/tpf-persona-store-cache.vala | 12 ++--- backends/telepathy/lib/tpf-persona.vala | 28 +++++----- backends/tracker/lib/trf-persona-store.vala | 4 +- backends/tracker/lib/trf-persona.vala | 52 +++++++++---------- folks/abstract-field-details.vala | 48 +++++++++++++++++ folks/backend-store.vala | 9 ++-- folks/debug.vala | 2 +- folks/individual-aggregator.vala | 8 +-- folks/individual.vala | 47 ++++++++--------- folks/potential-match.vala | 2 +- tests/eds/add-persona.vala | 20 ++++---- tests/eds/email-details.vala | 3 +- tests/eds/individual-retrieval.vala | 3 +- tests/eds/link-personas.vala | 20 ++++---- tests/eds/phone-details.vala | 3 +- tests/eds/set-emails.vala | 4 +- tests/eds/set-im-addresses.vala | 4 +- tests/eds/set-phones.vala | 4 +- tests/eds/set-roles.vala | 4 +- tests/folks/aggregation.vala | 2 +- tests/folks/backend-loading.vala | 12 ++--- tests/key-file/individual-retrieval.vala | 3 +- tests/telepathy/individual-properties.vala | 12 ++--- tests/telepathy/individual-retrieval.vala | 7 ++- tests/tracker/add-persona.vala | 28 +++++----- tests/tracker/duplicated-emails.vala | 8 +-- tests/tracker/duplicated-phones.vala | 8 +-- tests/tracker/link-personas.vala | 8 +-- tests/tracker/match-email-addresses.vala | 8 +-- tests/tracker/match-im-addresses.vala | 8 +-- tests/tracker/match-known-emails.vala | 8 +-- tests/tracker/match-phone-number.vala | 8 +-- tests/tracker/remove-persona.vala | 4 +- tests/tracker/set-duplicate-email.vala | 8 +-- tests/tracker/set-emails.vala | 4 +- tests/tracker/set-im-addresses.vala | 4 +- tests/tracker/set-notes.vala | 4 +- tests/tracker/set-phones.vala | 4 +- tests/tracker/set-postal-addresses.vala | 4 +- tests/tracker/set-roles.vala | 4 +- tests/tracker/set-urls.vala | 4 +- tools/inspect/inspect.vala | 2 +- 45 files changed, 285 insertions(+), 240 deletions(-) diff --git a/backends/eds/lib/edsf-persona.vala b/backends/eds/lib/edsf-persona.vala index a27653a..e9bd8d1 100644 --- a/backends/eds/lib/edsf-persona.vala +++ b/backends/eds/lib/edsf-persona.vala @@ -490,8 +490,8 @@ public class Edsf.Persona : Folks.Persona, private HashMultiMap _im_addresses = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -744,37 +744,37 @@ public class Edsf.Persona : Folks.Persona, this._gender = Gender.UNSPECIFIED; this._phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._phone_numbers_ro = this._phone_numbers.read_only_view; this._email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._email_addresses_ro = this._email_addresses.read_only_view; this._notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._notes_ro = this._notes.read_only_view; this._urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._urls_ro = this._urls.read_only_view; this._postal_addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._postal_addresses_ro = this._postal_addresses.read_only_view; this._local_ids = new HashSet (); this._local_ids_ro = this._local_ids.read_only_view; this._web_service_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._groups = new HashSet (); this._groups_ro = this._groups.read_only_view; this._roles = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._roles_ro = this._roles.read_only_view; this._update (this._contact); @@ -958,8 +958,8 @@ public class Edsf.Persona : Folks.Persona, private void _update_roles () { var new_roles = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var default_role_fd = this._get_default_role (); if (default_role_fd != null) @@ -1079,8 +1079,8 @@ public class Edsf.Persona : Folks.Persona, { var new_services = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS"); if (services != null) @@ -1112,8 +1112,8 @@ public class Edsf.Persona : Folks.Persona, private void _update_emails () { var new_email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var attrs = this.contact.get_attributes (E.ContactField.EMAIL); foreach (var attr in attrs) @@ -1141,8 +1141,8 @@ public class Edsf.Persona : Folks.Persona, private void _update_notes () { var new_notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var n = this._get_property ("note"); if (n != null && n != "") @@ -1349,8 +1349,8 @@ public class Edsf.Persona : Folks.Persona, { var im_eds_map = this._get_im_eds_map (); var new_im_addresses = new HashMultiMap (null, - null, (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + null, AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); foreach (var im_proto in im_eds_map.get_keys ()) { @@ -1554,8 +1554,8 @@ public class Edsf.Persona : Folks.Persona, private void _update_phones () { var new_phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var attrs = this.contact.get_attributes (E.ContactField.TEL); foreach (var attr in attrs) @@ -1643,8 +1643,8 @@ public class Edsf.Persona : Folks.Persona, private void _update_addresses () { var new_postal_addresses = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var attrs = this.contact.get_attributes (E.ContactField.ADDRESS); foreach (unowned E.VCardAttribute attr in attrs) diff --git a/backends/key-file/kf-persona.vala b/backends/key-file/kf-persona.vala index 854d14c..b87aa45 100644 --- a/backends/key-file/kf-persona.vala +++ b/backends/key-file/kf-persona.vala @@ -144,8 +144,8 @@ public class Folks.Backends.Kf.Persona : Folks.Persona, * table of them to set as the new property value */ var new_im_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); foreach (var protocol2 in im_addresses.get_keys ()) { @@ -231,8 +231,8 @@ public class Folks.Backends.Kf.Persona : Folks.Persona, var new_web_service_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); foreach (var web_service2 in web_service_addresses.get_keys ()) { @@ -280,12 +280,13 @@ public class Folks.Backends.Kf.Persona : Folks.Persona, this.iid, this.display_id); this._im_addresses = new HashMultiMap ( - null, null, ImFieldDetails.hash, (EqualFunc) ImFieldDetails.equal); + null, null, AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._web_service_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /* Load the IM addresses from the key file */ unowned KeyFile key_file = ((Kf.PersonaStore) this.store).get_key_file (); diff --git a/backends/libsocialweb/lib/swf-persona.vala b/backends/libsocialweb/lib/swf-persona.vala index cce3616..14bbcd2 100644 --- a/backends/libsocialweb/lib/swf-persona.vala +++ b/backends/libsocialweb/lib/swf-persona.vala @@ -148,13 +148,14 @@ public class Swf.Persona : Folks.Persona, private HashMultiMap _im_addresses = new HashMultiMap (null, null, - ImFieldDetails.hash, (EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private HashMultiMap _web_service_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -388,8 +389,8 @@ public class Swf.Persona : Folks.Persona, } var urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var website = contact.get_value ("url"); if (website != null) diff --git a/backends/telepathy/lib/tpf-persona-store-cache.vala b/backends/telepathy/lib/tpf-persona-store-cache.vala index bd3321b..6db2ac9 100644 --- a/backends/telepathy/lib/tpf-persona-store-cache.vala +++ b/backends/telepathy/lib/tpf-persona-store-cache.vala @@ -320,14 +320,14 @@ internal class Tpf.PersonaStoreCache : Folks.ObjectCache } var email_address_set = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_number_set = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var url_set = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); if (object_version == 2) { diff --git a/backends/telepathy/lib/tpf-persona.vala b/backends/telepathy/lib/tpf-persona.vala index 9eab227..005a30d 100644 --- a/backends/telepathy/lib/tpf-persona.vala +++ b/backends/telepathy/lib/tpf-persona.vala @@ -345,8 +345,8 @@ public class Tpf.Persona : Folks.Persona, private HashSet _email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _email_addresses_ro; /** @@ -375,8 +375,8 @@ public class Tpf.Persona : Folks.Persona, private HashMultiMap _im_addresses = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * A mapping of IM protocol to an (unordered) set of IM addresses. @@ -608,8 +608,8 @@ public class Tpf.Persona : Folks.Persona, private HashSet _phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _phone_numbers_ro; /** @@ -637,8 +637,8 @@ public class Tpf.Persona : Folks.Persona, } private HashSet _urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _urls_ro; /** @@ -861,14 +861,14 @@ public class Tpf.Persona : Folks.Persona, var new_birthday_str = ""; var new_full_name = ""; var new_email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var new_phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var new_urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var contact_info = this.contact.get_contact_info (); foreach (var info in contact_info) diff --git a/backends/tracker/lib/trf-persona-store.vala b/backends/tracker/lib/trf-persona-store.vala index 51e22aa..a2b37ed 100644 --- a/backends/tracker/lib/trf-persona-store.vala +++ b/backends/tracker/lib/trf-persona-store.vala @@ -826,8 +826,8 @@ public class Trf.PersonaStore : Folks.PersonaStore { var ret = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var services = ws_addrs.split (";"); foreach (var service_line in services) diff --git a/backends/tracker/lib/trf-persona.vala b/backends/tracker/lib/trf-persona.vala index e9cbfc4..868a3e5 100644 --- a/backends/tracker/lib/trf-persona.vala +++ b/backends/tracker/lib/trf-persona.vala @@ -378,8 +378,8 @@ public class Trf.Persona : Folks.Persona, private HashMultiMap _im_addresses = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -468,8 +468,8 @@ public class Trf.Persona : Folks.Persona, private HashMultiMap _web_service_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -558,28 +558,28 @@ public class Trf.Persona : Folks.Persona, this._full_name = ""; this._structured_name = null; this._phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._phone_numbers_ro = this._phone_numbers.read_only_view; this._email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._email_addresses_ro = this._email_addresses.read_only_view; this._roles = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._roles_ro = this._roles.read_only_view; this._notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._notes_ro = this._notes.read_only_view; this._urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._urls_ro = this._urls.read_only_view; this._postal_addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); this._postal_addresses_ro = this._postal_addresses.read_only_view; this._local_ids = new HashSet (); this._local_ids_ro = this._local_ids.read_only_view; @@ -804,8 +804,8 @@ public class Trf.Persona : Folks.Persona, } var postal_addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); string[] addresses_a = postal_field.split ("\n"); @@ -984,8 +984,8 @@ public class Trf.Persona : Folks.Persona, } HashSet role_fds = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); string[] roles_a = roles_field.split ("\n"); @@ -1221,8 +1221,8 @@ public class Trf.Persona : Folks.Persona, } var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); string[] phones_a = phones_field.split ("\n"); foreach (var p in phones_a) @@ -1347,8 +1347,8 @@ public class Trf.Persona : Folks.Persona, } var email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); string[] emails_a = emails_field.split (","); foreach (var e in emails_a) @@ -1372,8 +1372,8 @@ public class Trf.Persona : Folks.Persona, private void _update_urls () { var url_fds = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var _urls_field = this._cursor.get_string (Trf.Fields.URLS).dup (); if (_urls_field == null) diff --git a/folks/abstract-field-details.vala b/folks/abstract-field-details.vala index 91281e4..278fdff 100644 --- a/folks/abstract-field-details.vala +++ b/folks/abstract-field-details.vala @@ -276,6 +276,32 @@ public abstract class Folks.AbstractFieldDetails : Object } /** + * Same as {@link AbstractFieldDetails.equal}, but static, + * so we can use libgee 0.8 without an api break. + * + * See https://bugzilla.gnome.org/show_bug.cgi?id=673918 + * This can and should be removed next time we break the api. + * Note: This uses Gee.EqualDataFunc signature, to avoid having to cast. + * + * @param left one {@link AbstractFieldDetails} to compare + * @param right another {@link AbstractFieldDetails} to compare + * + * @return whether the elemants are equal + * + * @since UNRELEASED + */ + public static bool equal_static (void* left, + void* right) + { + GLib.return_val_if_fail (left != null, false); + GLib.return_val_if_fail (right != null, false); + + AbstractFieldDetails left_details = (AbstractFieldDetails) left; + AbstractFieldDetails right_details = (AbstractFieldDetails) right; + return left_details.equal (right_details); + } + + /** * An equality function which only considers parameters. * * This function compares: @@ -405,4 +431,26 @@ public abstract class Folks.AbstractFieldDetails : Object return hash_func (this.value); } + + /** + * Same as {@link AbstractFieldDetails.hash}, but static, + * so we can use libgee 0.8 without an api break. + * + * See https://bugzilla.gnome.org/show_bug.cgi?id=673918 + * This can and should be removed next time we break the api. + * Note: This uses Gee.HashDataFunc signature, to avoit having to cast. + * + * @param value the value to hash + * + * @return the hash value + * + * @since UNRELEASED + */ + public static uint hash_static (void* value) + { + GLib.return_val_if_fail (value != null, 0); + + AbstractFieldDetails details = (AbstractFieldDetails) value; + return details.hash (); + } } diff --git a/folks/backend-store.vala b/folks/backend-store.vala index 0f08de7..ba47e51 100644 --- a/folks/backend-store.vala +++ b/folks/backend-store.vala @@ -146,10 +146,9 @@ public class Folks.BackendStore : Object { this._debug.print_status.connect (this._debug_print_status); - this._modules = new HashMap (str_hash, str_equal); - this._backend_hash = new HashMap (str_hash, str_equal); - this._prepared_backends = new HashMap (str_hash, - str_equal); + this._modules = new HashMap (); + this._backend_hash = new HashMap (); + this._prepared_backends = new HashMap (); this._prepared_backends_ro = this._prepared_backends.read_only_view; } @@ -596,7 +595,7 @@ public class Folks.BackendStore : Object { return null; } - var modules_final = new HashMap (str_hash, str_equal); + var modules_final = new HashMap (); foreach (var info in infos) { diff --git a/folks/debug.vala b/folks/debug.vala index 233af2f..62b4a1f 100644 --- a/folks/debug.vala +++ b/folks/debug.vala @@ -236,7 +236,7 @@ public class Folks.Debug : Object lock (retval._domains) { retval._all = false; - retval._domains = new HashSet (str_hash, str_equal); + retval._domains = new HashSet (); if (debug_flags != null && debug_flags != "") { diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala index 94207e0..38b3f05 100644 --- a/folks/individual-aggregator.vala +++ b/folks/individual-aggregator.vala @@ -1770,13 +1770,13 @@ public class Folks.IndividualAggregator : Object /* `protocols_addrs_set` will be passed to the new Kf.Persona */ var protocols_addrs_set = new HashMultiMap ( null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var web_service_addrs_set = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /* List of local_ids */ var local_ids = new Gee.HashSet (); diff --git a/folks/individual.vala b/folks/individual.vala index e163836..8a612a7 100644 --- a/folks/individual.vala +++ b/folks/individual.vala @@ -102,7 +102,7 @@ public class Folks.Individual : Object, { /* Stores the Personas contained in this Individual. */ private HashSet _persona_set = - new HashSet (direct_hash, direct_equal); + new HashSet (); /* Read-only view of the above set */ private Set _persona_set_ro; /* Mapping from PersonaStore -> number of Personas from that store contained @@ -470,8 +470,8 @@ public class Folks.Individual : Object, } private HashSet _urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _urls_ro; /** @@ -486,8 +486,8 @@ public class Folks.Individual : Object, private HashSet _phone_numbers = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _phone_numbers_ro; /** @@ -502,8 +502,8 @@ public class Folks.Individual : Object, private HashSet _email_addresses = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _email_addresses_ro; /** @@ -517,8 +517,8 @@ public class Folks.Individual : Object, } private HashSet _roles = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _roles_ro; /** @@ -569,8 +569,8 @@ public class Folks.Individual : Object, } private HashSet _notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _notes_ro; /** @@ -585,8 +585,8 @@ public class Folks.Individual : Object, private HashSet _postal_addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); private Set _postal_addresses_ro; /** @@ -748,7 +748,8 @@ public class Folks.Individual : Object, private HashMultiMap _im_addresses = new HashMultiMap ( - null, null, ImFieldDetails.hash, (EqualFunc) ImFieldDetails.equal); + null, null, AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -762,8 +763,8 @@ public class Folks.Individual : Object, private HashMultiMap _web_service_addresses = new HashMultiMap (null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); /** * {@inheritDoc} @@ -804,7 +805,7 @@ public class Folks.Individual : Object, public DateTime? last_im_interaction_datetime { - get + get { if (this._last_im_interaction_datetime == null) { @@ -833,7 +834,7 @@ public class Folks.Individual : Object, */ public uint call_interaction_count { - get + get { uint counter = 0; /* Iterate over all personas and sum up their call interaction counts*/ @@ -1621,7 +1622,7 @@ public class Folks.Individual : Object, } /* Subscribe to the interactions signal for the persona */ var p_interaction_details = persona as InteractionDetails; - if (p_interaction_details != null) + if (p_interaction_details != null) { persona.notify["im-interaction-count"].connect (this._notify_im_interaction_count_cb); persona.notify["call-interaction-count"].connect (this._notify_call_interaction_count_cb); @@ -1762,7 +1763,7 @@ public class Folks.Individual : Object, /* Unsubscribe from the interactions signal for the persona */ var p_interaction_details = persona as InteractionDetails; - if (p_interaction_details != null) + if (p_interaction_details != null) { persona.notify["im-interaction-count"].disconnect (this._notify_im_interaction_count_cb); persona.notify["call-interaction-count"].disconnect (this._notify_call_interaction_count_cb); @@ -1829,7 +1830,7 @@ public class Folks.Individual : Object, /* Populate the URLs as the union of our Personas' URLs. * If the same URL exists multiple times we merge the parameters. */ var urls_set = new HashMap ( - null, null, (GLib.EqualFunc) UrlFieldDetails.equal); + null, null, AbstractFieldDetails.equal_static); this._urls.clear (); @@ -1863,7 +1864,7 @@ public class Folks.Individual : Object, * If the same number exists multiple times we merge the parameters. */ var phone_numbers_set = new HashMap ( - null, null, (GLib.EqualFunc) PhoneFieldDetails.equal); + null, null, AbstractFieldDetails.equal_static); this._phone_numbers.clear (); @@ -1896,7 +1897,7 @@ public class Folks.Individual : Object, /* Populate the email addresses as the union of our Personas' addresses. * If the same address exists multiple times we merge the parameters. */ var emails_set = new HashMap ( - null, null, (GLib.EqualFunc) EmailFieldDetails.equal); + null, null, AbstractFieldDetails.equal_static); this._email_addresses.clear (); diff --git a/folks/potential-match.vala b/folks/potential-match.vala index aab3341..07a2504 100644 --- a/folks/potential-match.vala +++ b/folks/potential-match.vala @@ -94,7 +94,7 @@ public class Folks.PotentialMatch : Object * @since 0.5.1 */ public static Set known_email_aliases = - new Gee.HashSet (str_hash, str_equal); + new Gee.HashSet (); private static double _DIST_THRESHOLD = 0.70; private const string _SEPARATORS = "._-+"; diff --git a/tests/eds/add-persona.vala b/tests/eds/add-persona.vala index b6b8c08..6c53095 100644 --- a/tests/eds/add-persona.vala +++ b/tests/eds/add-persona.vala @@ -169,8 +169,8 @@ public class AddPersonaTests : Folks.TestCase Value? v2 = Value (typeof (Set)); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); email_1.set_parameter (email_1.PARAM_TYPE, email_1.PARAM_TYPE_HOME); emails.add (email_1); @@ -195,8 +195,8 @@ public class AddPersonaTests : Folks.TestCase Value? v5 = Value (typeof (Set)); var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_1 = new PhoneFieldDetails (this._phone_1); phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE, @@ -213,8 +213,8 @@ public class AddPersonaTests : Folks.TestCase Value? v6 = Value (typeof (Set)); var pa_fds = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); PostalAddress pa_a = new PostalAddress (this._po_box, this._extension, this._street, this._locality, this._region, @@ -237,8 +237,8 @@ public class AddPersonaTests : Folks.TestCase Value? v8 = Value (typeof (Set)); var notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var note = new NoteFieldDetails (this._note); notes.add (note); v8.set_object (notes); @@ -254,8 +254,8 @@ public class AddPersonaTests : Folks.TestCase Value? v10 = Value (typeof (Set)); var role_fds = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var r1 = new Role ("Dr.", "The Nut House Ltd"); r1.role = "The Manager"; var role_fd1 = new RoleFieldDetails (r1); diff --git a/tests/eds/email-details.vala b/tests/eds/email-details.vala index 10dd688..3a56092 100644 --- a/tests/eds/email-details.vala +++ b/tests/eds/email-details.vala @@ -58,8 +58,7 @@ public class EmailDetailsTests : Folks.TestCase public void test_email_details () { this._email_count = 0; - this._email_types = new HashSet (str_hash, - str_equal); + this._email_types = new HashSet (); this._c1 = new Gee.HashMap (); this._c2 = new Gee.HashMap (); this._c3 = new Gee.HashMap (); diff --git a/tests/eds/individual-retrieval.vala b/tests/eds/individual-retrieval.vala index b3d8e4e..be3aec5 100644 --- a/tests/eds/individual-retrieval.vala +++ b/tests/eds/individual-retrieval.vala @@ -55,8 +55,7 @@ public class IndividualRetrievalTests : Folks.TestCase { Gee.HashMap c1 = new Gee.HashMap (); Gee.HashMap c2 = new Gee.HashMap (); - this._found_individuals = new HashSet (str_hash, - str_equal); + this._found_individuals = new HashSet (); this._main_loop = new GLib.MainLoop (null, false); Value? v; diff --git a/tests/eds/link-personas.vala b/tests/eds/link-personas.vala index 745de8a..1d17cf4 100644 --- a/tests/eds/link-personas.vala +++ b/tests/eds/link-personas.vala @@ -219,8 +219,8 @@ public class LinkPersonasTests : Folks.TestCase v1 = Value (typeof (MultiMap)); var im_addrs1 = new HashMultiMap ( null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS) im_addrs1.set ("jabber", new ImFieldDetails (this._auto_linkable_email)); @@ -234,8 +234,8 @@ public class LinkPersonasTests : Folks.TestCase v1 = Value (typeof (MultiMap)); var wsa1 = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); wsa1.set ("twitter", new WebServiceFieldDetails (this._im_address_1)); v1.set_object (wsa1); details1.insert (wsk, (owned) v1); @@ -254,8 +254,8 @@ public class LinkPersonasTests : Folks.TestCase v3 = Value (typeof (MultiMap)); var im_addrs2 = new HashMultiMap ( null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs2.set ("yahoo", new ImFieldDetails (this._im_address_2)); v3.set_object (im_addrs2); details2.insert ("im-addresses", (owned) v3); @@ -265,8 +265,8 @@ public class LinkPersonasTests : Folks.TestCase v3 = Value (typeof (MultiMap)); var wsa2 = new HashMultiMap ( null, null, - (GLib.HashFunc) WebServiceFieldDetails.hash, - (GLib.EqualFunc) WebServiceFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2)); v3.set_object (wsa2); details2.insert (wsk, (owned) v3); @@ -275,8 +275,8 @@ public class LinkPersonasTests : Folks.TestCase { v3 = Value (typeof (Set)); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._auto_linkable_email); emails.add (email_1); v3.set_object (emails); diff --git a/tests/eds/phone-details.vala b/tests/eds/phone-details.vala index 047ed00..7b7e39e 100644 --- a/tests/eds/phone-details.vala +++ b/tests/eds/phone-details.vala @@ -57,8 +57,7 @@ public class PhoneDetailsTests : Folks.TestCase public void test_phone_numbers () { this._phones_count = 0; - this._phone_types = new HashSet (str_hash, - str_equal); + this._phone_types = new HashSet (); this._c1 = new Gee.HashMap (); this._c2 = new Gee.HashMap (); this._main_loop = new GLib.MainLoop (null, false); diff --git a/tests/eds/set-emails.vala b/tests/eds/set-emails.vala index a22dd65..0e5e4d0 100644 --- a/tests/eds/set-emails.vala +++ b/tests/eds/set-emails.vala @@ -120,8 +120,8 @@ public class SetEmailsTests : Folks.TestCase foreach (var p in i.personas) { var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails ("bernie@example.org"); email_1.set_parameter (email_1.PARAM_TYPE, email_1.PARAM_TYPE_OTHER); diff --git a/tests/eds/set-im-addresses.vala b/tests/eds/set-im-addresses.vala index cfa9379..056fe40 100644 --- a/tests/eds/set-im-addresses.vala +++ b/tests/eds/set-im-addresses.vala @@ -127,8 +127,8 @@ public class SetIMAddressesTests : Folks.TestCase { var im_addrs = new HashMultiMap ( null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs.set ("jabber", new ImFieldDetails ("bernie@example.org")); ((ImDetails) p).im_addresses = im_addrs; diff --git a/tests/eds/set-phones.vala b/tests/eds/set-phones.vala index 1635cae..81d2157 100644 --- a/tests/eds/set-phones.vala +++ b/tests/eds/set-phones.vala @@ -120,8 +120,8 @@ public class SetPhonesTests : Folks.TestCase foreach (var p in i.personas) { var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_1 = new PhoneFieldDetails ("1234"); phone_1.set_parameter (phone_1.PARAM_TYPE, phone_1.PARAM_TYPE_HOME); diff --git a/tests/eds/set-roles.vala b/tests/eds/set-roles.vala index db234eb..78dfcea 100644 --- a/tests/eds/set-roles.vala +++ b/tests/eds/set-roles.vala @@ -119,8 +119,8 @@ public class SetRolesTests : Folks.TestCase foreach (var p in i.personas) { var role_fds = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var r1 = new Role ("Dr.", "The Nut House Ltd"); r1.role = "The Manager"; var role_fd1 = new RoleFieldDetails (r1); diff --git a/tests/folks/aggregation.vala b/tests/folks/aggregation.vala index e555998..39b7d2d 100644 --- a/tests/folks/aggregation.vala +++ b/tests/folks/aggregation.vala @@ -36,7 +36,7 @@ public class AggregationTests : Folks.TestCase this._tp_backend = new TpTests.Backend (); /* Create a set of the individuals we expect to see */ - this._default_personas = new HashSet (str_hash, str_equal); + this._default_personas = new HashSet (); this._default_personas.add ("travis@example.com"); this._default_personas.add ("olivier@example.com"); diff --git a/tests/folks/backend-loading.vala b/tests/folks/backend-loading.vala index ebe679f..30d4363 100644 --- a/tests/folks/backend-loading.vala +++ b/tests/folks/backend-loading.vala @@ -85,7 +85,7 @@ public class BackendLoadingTests : Folks.TestCase public void test_load_and_prep () { var main_loop = new GLib.MainLoop (null, false); - var backends_expected = new HashSet (str_hash, str_equal); + var backends_expected = new HashSet (); backends_expected.add ("key-file"); backends_expected.add ("telepathy"); @@ -135,7 +135,7 @@ public class BackendLoadingTests : Folks.TestCase private async void test_disabling_async (BackendStore store) { - var backends_expected = new HashSet (str_hash, str_equal); + var backends_expected = new HashSet (); backends_expected.add ("key-file"); /* Disable some backends */ @@ -181,7 +181,7 @@ public class BackendLoadingTests : Folks.TestCase /* * First loading */ - backends_expected = new HashSet (str_hash, str_equal); + backends_expected = new HashSet (); backends_expected.add ("key-file"); backends_expected.add ("telepathy"); @@ -205,7 +205,7 @@ public class BackendLoadingTests : Folks.TestCase /* * Second loading: late disabling */ - backends_expected = new HashSet (str_hash, str_equal); + backends_expected = new HashSet (); backends_expected.add ("telepathy"); /* Disable some backends */ @@ -232,7 +232,7 @@ public class BackendLoadingTests : Folks.TestCase /* * Third loading: late enabling */ - backends_expected = new HashSet (str_hash, str_equal); + backends_expected = new HashSet (); backends_expected.add ("key-file"); backends_expected.add ("telepathy"); @@ -261,7 +261,7 @@ public class BackendLoadingTests : Folks.TestCase * Fourth loading: idempotency */ - backends_expected = new HashSet (str_hash, str_equal); + backends_expected = new HashSet (); backends_expected.add ("key-file"); backends_expected.add ("telepathy"); diff --git a/tests/key-file/individual-retrieval.vala b/tests/key-file/individual-retrieval.vala index 744e71e..0ecdceb 100644 --- a/tests/key-file/individual-retrieval.vala +++ b/tests/key-file/individual-retrieval.vala @@ -58,8 +58,7 @@ public class IndividualRetrievalTests : Folks.TestCase "jabber=bar@jabber.org\n"); /* Create a set of the individuals we expect to see */ - HashSet expected_individuals = new HashSet (str_hash, - str_equal); + HashSet expected_individuals = new HashSet (); expected_individuals.add ("0"); expected_individuals.add ("1"); diff --git a/tests/telepathy/individual-properties.vala b/tests/telepathy/individual-properties.vala index 09fabb3..0e23da9 100644 --- a/tests/telepathy/individual-properties.vala +++ b/tests/telepathy/individual-properties.vala @@ -489,16 +489,16 @@ public class IndividualPropertiesTests : Folks.TestCase assert (persona is Tpf.Persona); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); emails.add (new_email_fd); var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); phones.add (new_phone_fd); var urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); urls.add (new_url_fd); /* set the extended info through Telepathy's ContactInfo interface and diff --git a/tests/telepathy/individual-retrieval.vala b/tests/telepathy/individual-retrieval.vala index 50ffb98..a8b6642 100644 --- a/tests/telepathy/individual-retrieval.vala +++ b/tests/telepathy/individual-retrieval.vala @@ -44,7 +44,7 @@ public class IndividualRetrievalTests : Folks.TestCase * e.g. * telepathy:/org/freedesktop/Telepathy/Account/cm/protocol/account:me@example.com * only in each Individual. */ - this.default_individuals = new HashSet (str_hash, str_equal); + this.default_individuals = new HashSet (); /* me@example.com */ default_individuals.add ("48fa372a81026063187255e3f5c184665d2ed7ce"); @@ -276,7 +276,7 @@ public class IndividualRetrievalTests : Folks.TestCase * add_persona_from_details can temporarily fail with * PersonaStoreError.STORE_OFFLINE (in which case, we just need to try * again later) */ - var ids_remaining = new HashSet (str_hash, str_equal); + var ids_remaining = new HashSet (); foreach (var contact_id in ids_add) ids_remaining.add (contact_id); @@ -286,8 +286,7 @@ public class IndividualRetrievalTests : Folks.TestCase foreach (var id in ids_remaining) { - var details = new HashTable (str_hash, - str_equal); + var details = new HashTable (str_hash, str_equal); details.insert ("contact", id); /* we can end up adding the same ID twice, since this async diff --git a/tests/tracker/add-persona.vala b/tests/tracker/add-persona.vala index 1626ee1..746de90 100644 --- a/tests/tracker/add-persona.vala +++ b/tests/tracker/add-persona.vala @@ -225,8 +225,8 @@ public class AddPersonaTests : Folks.TestCase Value? v8 = Value (typeof (Set)); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails.add (email_1); var email_2 = new EmailFieldDetails (this._email_2); @@ -238,8 +238,8 @@ public class AddPersonaTests : Folks.TestCase Value? v9 = Value (typeof (MultiMap)); var im_addrs = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs.set ("jabber", new ImFieldDetails (this._im_addr_1)); im_addrs.set ("yahoo", new ImFieldDetails (this._im_addr_2)); v9.set_object (im_addrs); @@ -248,8 +248,8 @@ public class AddPersonaTests : Folks.TestCase Value? v10 = Value (typeof (Set)); var notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); NoteFieldDetails note_fd_1 = new NoteFieldDetails (this._note_1); notes.add (note_fd_1); v10.set_object (notes); @@ -258,8 +258,8 @@ public class AddPersonaTests : Folks.TestCase Value? v11 = Value (typeof (Set)); var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_1 = new PhoneFieldDetails (this._phone_1); phones.add (phone_1); @@ -272,8 +272,8 @@ public class AddPersonaTests : Folks.TestCase Value? v12 = Value (typeof (Set)); var role_fds = new HashSet ( - (GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var r1 = new Role (this._title_1, this._organisation_1); r1.role = this._role_1; var role_fd1 = new RoleFieldDetails (r1); @@ -284,8 +284,8 @@ public class AddPersonaTests : Folks.TestCase Value? v13 = Value (typeof (Set)); var postal_addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var postal_a = new PostalAddress (this._po_box, @@ -300,8 +300,8 @@ public class AddPersonaTests : Folks.TestCase Value? v14 = Value (typeof (Set)); var urls = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var url_1 = new UrlFieldDetails (this._url_1); urls.add (url_1); var url_2 = new UrlFieldDetails (this._url_2); diff --git a/tests/tracker/duplicated-emails.vala b/tests/tracker/duplicated-emails.vala index a4d5f6f..677119f 100644 --- a/tests/tracker/duplicated-emails.vala +++ b/tests/tracker/duplicated-emails.vala @@ -174,8 +174,8 @@ public class DuplicatedEmailsTests : Folks.TestCase val = Value (typeof (Set)); var emails1 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails1.add (email_1); val.set_object (emails1); @@ -190,8 +190,8 @@ public class DuplicatedEmailsTests : Folks.TestCase val = Value (typeof (Set)); var emails2 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_2 = new EmailFieldDetails (this._email_1); emails2.add (email_2); val.set_object (emails2); diff --git a/tests/tracker/duplicated-phones.vala b/tests/tracker/duplicated-phones.vala index 8bd59bf..162b895 100644 --- a/tests/tracker/duplicated-phones.vala +++ b/tests/tracker/duplicated-phones.vala @@ -174,8 +174,8 @@ public class DuplicatedPhonesTests : Folks.TestCase val = Value (typeof (Set)); var phones1 = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_1 = new PhoneFieldDetails (this._phone_1); phones1.add (phone_1); val.set_object (phones1); @@ -190,8 +190,8 @@ public class DuplicatedPhonesTests : Folks.TestCase val = Value (typeof (Set)); var phones2 = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_2 = new PhoneFieldDetails (this._phone_1); phones2.add (phone_2); val.set_object (phones2); diff --git a/tests/tracker/link-personas.vala b/tests/tracker/link-personas.vala index a544d92..57abf86 100644 --- a/tests/tracker/link-personas.vala +++ b/tests/tracker/link-personas.vala @@ -142,8 +142,8 @@ public class LinkPersonasTests : Folks.TestCase (str_hash, str_equal); Value? v1 = Value (typeof (MultiMap)); var im_addrs1 = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs1.set (this._proto, new ImFieldDetails (this._im_address_1)); v1.set_object (im_addrs1); details1.insert ("im-addresses", (owned) v1); @@ -156,8 +156,8 @@ public class LinkPersonasTests : Folks.TestCase (str_hash, str_equal); Value? v3 = Value (typeof (MultiMap)); var im_addrs2 = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs2.set (this._proto, new ImFieldDetails (this._im_address_2)); v3.set_object (im_addrs2); details2.insert ("im-addresses", (owned) v3); diff --git a/tests/tracker/match-email-addresses.vala b/tests/tracker/match-email-addresses.vala index ae5b335..ab09c04 100644 --- a/tests/tracker/match-email-addresses.vala +++ b/tests/tracker/match-email-addresses.vala @@ -179,8 +179,8 @@ public class MatchEmailAddressesTests : Folks.TestCase val = Value (typeof (Set)); var emails1 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails1.add (email_1); val.set_object (emails1); @@ -195,8 +195,8 @@ public class MatchEmailAddressesTests : Folks.TestCase val = Value (typeof (Set)); var emails2 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_2 = new EmailFieldDetails (this._email_1); emails2.add (email_2); val.set_object (emails2); diff --git a/tests/tracker/match-im-addresses.vala b/tests/tracker/match-im-addresses.vala index 45242de..4d7957f 100644 --- a/tests/tracker/match-im-addresses.vala +++ b/tests/tracker/match-im-addresses.vala @@ -180,8 +180,8 @@ public class MatchIMAddressesTests : Folks.TestCase val = Value (typeof (MultiMap)); im_addrs = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs.set ("jabber", new ImFieldDetails (this._im_addr_1)); im_addrs.set ("yahoo", new ImFieldDetails (this._im_addr_2)); val.set_object (im_addrs); @@ -196,8 +196,8 @@ public class MatchIMAddressesTests : Folks.TestCase val = Value (typeof (MultiMap)); im_addrs = new HashMultiMap (null, null, - (GLib.HashFunc) ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addrs.set ("jabber", new ImFieldDetails (this._im_addr_2)); val.set_object (im_addrs); details2.insert ( diff --git a/tests/tracker/match-known-emails.vala b/tests/tracker/match-known-emails.vala index 27e916c..ba67281 100644 --- a/tests/tracker/match-known-emails.vala +++ b/tests/tracker/match-known-emails.vala @@ -187,8 +187,8 @@ public class MatchKnownEmailsTests : Folks.TestCase val = Value (typeof (Set)); var emails1 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails1.add (email_1); val.set_object (emails1); @@ -203,8 +203,8 @@ public class MatchKnownEmailsTests : Folks.TestCase val = Value (typeof (Set)); var emails2 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_2 = new EmailFieldDetails (this._email_1); emails2.add (email_2); val.set_object (emails2); diff --git a/tests/tracker/match-phone-number.vala b/tests/tracker/match-phone-number.vala index f0641f4..044d9e5 100644 --- a/tests/tracker/match-phone-number.vala +++ b/tests/tracker/match-phone-number.vala @@ -181,8 +181,8 @@ public class MatchPhoneNumberTests : Folks.TestCase val = Value (typeof (Set)); var phone_numbers1 = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_number_1 = new PhoneFieldDetails (this._phone_1); phone_numbers1.add (phone_number_1); val.set_object (phone_numbers1); @@ -197,8 +197,8 @@ public class MatchPhoneNumberTests : Folks.TestCase val = Value (typeof (Set)); var phone_numbers2 = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var phone_number_2 = new PhoneFieldDetails (this._phone_2); phone_numbers2.add (phone_number_2); val.set_object (phone_numbers2); diff --git a/tests/tracker/remove-persona.vala b/tests/tracker/remove-persona.vala index 6c87e92..0fc0114 100644 --- a/tests/tracker/remove-persona.vala +++ b/tests/tracker/remove-persona.vala @@ -133,8 +133,8 @@ public class RemovePersonaTests : Folks.TestCase Value? v2 = Value (typeof (Set)); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails ("test-1@example.org"); emails.add (email_1); var email_2 = new EmailFieldDetails ("test-2@example.org"); diff --git a/tests/tracker/set-duplicate-email.vala b/tests/tracker/set-duplicate-email.vala index 766312c..4b9770b 100644 --- a/tests/tracker/set-duplicate-email.vala +++ b/tests/tracker/set-duplicate-email.vala @@ -132,8 +132,8 @@ public class SetDuplicateEmailTests : Folks.TestCase if (this._has_email ((Trf.Persona) p, this._email_1)) { var emails1 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails1.add (email_1); ((EmailDetails) p).email_addresses = emails1; @@ -204,8 +204,8 @@ public class SetDuplicateEmailTests : Folks.TestCase val = Value (typeof (Set)); var emails1 = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var email_1 = new EmailFieldDetails (this._email_1); emails1.add (email_1); val.set_object (emails1); diff --git a/tests/tracker/set-emails.vala b/tests/tracker/set-emails.vala index c7e5720..1d38cca 100644 --- a/tests/tracker/set-emails.vala +++ b/tests/tracker/set-emails.vala @@ -115,8 +115,8 @@ public class SetEmailsTests : Folks.TestCase i.notify["email-addresses"].connect (this._notify_emails_cb); var emails = new HashSet ( - (GLib.HashFunc) EmailFieldDetails.hash, - (GLib.EqualFunc) EmailFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var p1 = new EmailFieldDetails (this._email_1); emails.add (p1); var p2 = new EmailFieldDetails (this._email_2); diff --git a/tests/tracker/set-im-addresses.vala b/tests/tracker/set-im-addresses.vala index a58b24b..fe92142 100644 --- a/tests/tracker/set-im-addresses.vala +++ b/tests/tracker/set-im-addresses.vala @@ -120,8 +120,8 @@ public class SetIMAddressesTests : Folks.TestCase var im_addresses = new HashMultiMap ( null, null, - (GLib.HashFunc)ImFieldDetails.hash, - (GLib.EqualFunc) ImFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); im_addresses.set ("aim", new ImFieldDetails ("one@example.org")); im_addresses.set ("aim", new ImFieldDetails ("two@example.org")); diff --git a/tests/tracker/set-notes.vala b/tests/tracker/set-notes.vala index 7db267b..189d38b 100644 --- a/tests/tracker/set-notes.vala +++ b/tests/tracker/set-notes.vala @@ -113,8 +113,8 @@ public class SetNotesTests : Folks.TestCase Gee.HashSet notes = new HashSet ( - (GLib.HashFunc) NoteFieldDetails.hash, - (GLib.EqualFunc) NoteFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var n = new NoteFieldDetails ("some note"); notes.add ((owned) n); diff --git a/tests/tracker/set-phones.vala b/tests/tracker/set-phones.vala index 8f3ccb1..d8dfd20 100644 --- a/tests/tracker/set-phones.vala +++ b/tests/tracker/set-phones.vala @@ -115,8 +115,8 @@ public class SetPhonesTests : Folks.TestCase i.notify["phone-numbers"].connect (this._notify_phones_cb); var phones = new HashSet ( - (GLib.HashFunc) PhoneFieldDetails.hash, - (GLib.EqualFunc) PhoneFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var p1 = new PhoneFieldDetails (this._phone_1); phones.add (p1); diff --git a/tests/tracker/set-postal-addresses.vala b/tests/tracker/set-postal-addresses.vala index 32f0678..0a6b954 100644 --- a/tests/tracker/set-postal-addresses.vala +++ b/tests/tracker/set-postal-addresses.vala @@ -121,8 +121,8 @@ public class SetPostalAddressesTests : Folks.TestCase i.notify["postal-addresses"].connect (this._notify_postal_cb); var addresses = new HashSet ( - (GLib.HashFunc) PostalAddressFieldDetails.hash, - (GLib.EqualFunc) PostalAddressFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var pa = new PostalAddress (null, null, null, null, null, null, null, null, null); pa.po_box = this._postal_address_fd.value.po_box; diff --git a/tests/tracker/set-roles.vala b/tests/tracker/set-roles.vala index 8d1de90..c44ecdf 100644 --- a/tests/tracker/set-roles.vala +++ b/tests/tracker/set-roles.vala @@ -115,8 +115,8 @@ public class SetRolesTests : Folks.TestCase Gee.HashSet role_fds = new HashSet - ((GLib.HashFunc) RoleFieldDetails.hash, - (GLib.EqualFunc) RoleFieldDetails.equal); + ( AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var role = new Role ("some title", "some organisation"); role.role = "some role"; var role_fd = new RoleFieldDetails (role); diff --git a/tests/tracker/set-urls.vala b/tests/tracker/set-urls.vala index 1ca7369..fbd9c0b 100644 --- a/tests/tracker/set-urls.vala +++ b/tests/tracker/set-urls.vala @@ -113,8 +113,8 @@ public class SetURLsTests : Folks.TestCase i.notify["urls"].connect (this._notify_urls_cb); var url_fds = new HashSet ( - (GLib.HashFunc) UrlFieldDetails.hash, - (GLib.EqualFunc) UrlFieldDetails.equal); + AbstractFieldDetails.hash_static, + AbstractFieldDetails.equal_static); var p1 = new UrlFieldDetails ( this._urls.get (UrlFieldDetails.PARAM_TYPE_BLOG)); p1.set_parameter (p1.PARAM_TYPE, p1.PARAM_TYPE_BLOG); diff --git a/tools/inspect/inspect.vala b/tools/inspect/inspect.vala index 1f34103..9d66234 100644 --- a/tools/inspect/inspect.vala +++ b/tools/inspect/inspect.vala @@ -101,7 +101,7 @@ public class Folks.Inspect.Client : Object { Utils.init (); - this.commands = new HashMap (str_hash, str_equal); + this.commands = new HashMap (); /* Register the commands we support */ /* FIXME: This should be automatic */ -- 2.7.4