Added hash_static and equal_static to AbstractFieldDetails.
Use AbstractFieldDetails hash_static and equal_static where needed.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=673918
=========================================================
Dependencies:
+• libgee ≥ 0.8.4
Major changes:
• Added an ofono backend
+• Ported to libgee 0.8.x
Bugs fixed:
• Bug 682941 — API to configure input of aggregation
• Bug 691923 — Don't rebuild docs on every "make" run
• Bug 692122 — build: Don't use make functions for defining TESTS
• Bug 693435 — eds test: create-remove-stores fails sporadically
+• Bug 673918 — Port to newer libgee
API changes:
• Add Backend.enable_persona_store and disable_persona_store.
folks \
folks-internal \
folks-eds \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
libebook-1.2 \
--vapidir=$(top_srcdir)/folks \
--pkg folks \
--pkg folks-internal \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg gio-2.0 \
--pkg gobject-2.0 \
--pkg libebook-1.2 \
private HashSet<EmailFieldDetails>? _email_addresses =
new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
private Set<EmailFieldDetails> _email_addresses_ro;
/**
* 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,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
debug ("Creating new Edsf.Persona with IID '%s'", this.iid);
this._gender = Gender.UNSPECIFIED;
+ this._phone_numbers = new HashSet<PhoneFieldDetails> (
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
+ this._phone_numbers_ro = this._phone_numbers.read_only_view;
+ this._email_addresses = new HashSet<EmailFieldDetails> (
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
+ this._email_addresses_ro = this._email_addresses.read_only_view;
+ this._notes = new HashSet<NoteFieldDetails> (
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
+ this._notes_ro = this._notes.read_only_view;
+ this._urls = new HashSet<UrlFieldDetails> (
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
+ this._urls_ro = this._urls.read_only_view;
+ this._postal_addresses = new HashSet<PostalAddressFieldDetails> (
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
+ this._postal_addresses_ro = this._postal_addresses.read_only_view;
+ this._local_ids = new HashSet<string> ();
this._local_ids_ro = this._local_ids.read_only_view;
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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;
+ this._roles = new HashSet<RoleFieldDetails> (
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
+ this._roles_ro = this._roles.read_only_view;
this._anti_links = new HashSet<string> ();
this._anti_links_ro = this._anti_links.read_only_view;
else if (this._roles == null)
{
this._roles = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
this._roles_ro = this._roles.read_only_view;
}
var new_roles = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
var default_role_fd = this._get_default_role ();
if (default_role_fd != null)
private void _update_web_services_addresses ()
{
var new_services = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS");
if (services != null)
private void _update_emails (bool emit_notification = true)
{
var new_email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var attrs = this.contact.get_attributes (E.ContactField.EMAIL);
foreach (var attr in attrs)
else if (this._notes == null)
{
this._notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._notes_ro = this._notes.read_only_view;
}
var new_notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var n = this._get_property<string> ("note");
if (n != null && n != "")
else if (this._urls == null)
{
this._urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._urls_ro = this._urls.read_only_view;
}
var new_urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/* First we get the standard Evo urls.. */
foreach (var mapping in Persona._url_properties)
{
var im_eds_map = Persona._get_im_eds_map ();
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (null,
- null, (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var im_proto in im_eds_map.get_keys ())
{
else if (this._phone_numbers == null)
{
this._phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._phone_numbers_ro = this._phone_numbers.read_only_view;
}
var new_phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var attrs = this.contact.get_attributes (E.ContactField.TEL);
foreach (var attr in attrs)
else if (this._postal_addresses == null)
{
this._postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
this._postal_addresses_ro = this._postal_addresses.read_only_view;
}
var new_postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
var attrs = this.contact.get_attributes (E.ContactField.ADDRESS);
foreach (unowned E.VCardAttribute attr in attrs)
Name: Folks e-d-s support library (uninstalled copy)
Description: Evolution Data Server support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 libebook-1.2 libedataserver-1.2
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 libebook-1.2 libedataserver-1.2
Libs: ${abs_top_builddir}/backends/telepathy/libfolks-eds.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/eds -I${abs_top_builddir}
folks
libebook-1.2
libedataserver-1.2
-gee-1.0
+gee-0.8
Name: Folks e-d-s support library
Description: Evolution Data Server support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 libebook-1.2 libedataserver-1.2
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 libebook-1.2 libedataserver-1.2
Libs: -L${libdir} -lfolks-eds
Cflags: -I${includedir}
--vapidir=$(top_srcdir)/folks \
--pkg folks \
--pkg folks-internal \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg gio-2.0 \
--pkg gobject-2.0 \
$(NULL)
/* 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,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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, ImFieldDetails.hash, (EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._anti_links = new HashSet<string> ();
this._anti_links_ro = this._anti_links.read_only_view;
folks \
folks-internal \
folks-libsocialweb \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
libsocialweb-client \
--pkg folks-internal \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg libsocialweb-client \
--includedir folks \
--vapi folks-libsocialweb.vapi \
folks_backend_libsocialweb_deps = \
folks \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
libsocialweb-client \
Name: Folks Libsocialweb support library (uninstalled copy)
Description: Libsocialweb support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 libsocialweb-client
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 libsocialweb-client
Libs: ${abs_top_builddir}/backends/telepathy/libfolks-libsocialweb.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/libsocialweb -I${abs_top_builddir}
Name: Folks libsocialweb support library
Description: Libsocialweb support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 libsocialweb-client
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 libsocialweb-client
Libs: -L${libdir} -lfolks-libsocialweb
Cflags: -I${includedir}
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
- ImFieldDetails.hash, (EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
private HashMultiMap<string, WebServiceFieldDetails> _web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
}
var urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var website = contact.get_value ("url");
if (website != null)
--vapidir=$(top_srcdir)/folks \
--pkg folks \
--pkg folks-internal \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg gio-2.0 \
--pkg gobject-2.0 \
--pkg libebook-1.2 \
folks \
folks-internal \
folks-telepathy \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
telepathy-glib \
--pkg tp-lowlevel \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg telepathy-glib \
$(ZEITGEIST_PKG) \
--includedir folks \
Name: Folks Telepathy support library (uninstalled copy)
Description: Telepathy support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11
Libs: ${abs_top_builddir}/backends/telepathy/libfolks-telepathy.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/telepathy -I${abs_top_builddir}
Name: Folks Telepathy support library
Description: Telepathy support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11
Libs: -L${libdir} -lfolks-telepathy
Cflags: -I${includedir}
}
var email_address_set = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_number_set = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var url_set = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
if (object_version == 2)
{
* 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,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* A mapping of IM protocol to an (unordered) set of IM addresses.
else if (this._urls == null)
{
this._urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._urls_ro = this._urls.read_only_view;
this._email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._email_addresses_ro = this._email_addresses.read_only_view;
this._phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._phone_numbers_ro = this._phone_numbers.read_only_view;
}
var new_birthday_str = "";
var new_full_name = "";
var new_email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var new_phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var new_urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var contact_info = contact.get_contact_info ();
foreach (var info in contact_info)
folks \
folks-internal \
folks-tracker \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--pkg folks-internal \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--includedir folks \
--vapi folks-tracker.vapi \
folks_backend_tracker_deps = \
folks \
- gee-1.0 \
+ gee-0.8 \
gio-2.0 \
gobject-2.0 \
tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
Name: Folks Tracker support library (uninstalled copy)
Description: Tracker support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 tracker-sparql-@TRACKER_SPARQL_MAJOR@
Libs: ${abs_top_builddir}/backends/telepathy/libfolks-tracker.la
Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/tracker -I${abs_top_builddir}
Name: Folks tracker support library
Description: Tracker support library for the Folks meta-contacts library
Version: @VERSION@
-Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
+Requires: folks glib-2.0 gobject-2.0 gee-0.8 tracker-sparql-@TRACKER_SPARQL_MAJOR@
Libs: -L${libdir} -lfolks-tracker
Cflags: -I${includedir}
string ws_addrs)
{
var ret = new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var services = ws_addrs.split (";");
foreach (var service_line in services)
private HashMultiMap<string, ImFieldDetails> _im_addresses =
new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
private HashMultiMap<string, WebServiceFieldDetails> _web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/**
* {@inheritDoc}
this._full_name = "";
this._structured_name = null;
this._phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._phone_numbers_ro = this._phone_numbers.read_only_view;
this._email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._email_addresses_ro = this._email_addresses.read_only_view;
this._roles = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
this._roles_ro = this._roles.read_only_view;
this._notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._notes_ro = this._notes.read_only_view;
this._urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._urls_ro = this._urls.read_only_view;
this._postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
this._postal_addresses_ro = this._postal_addresses.read_only_view;
this._local_ids = new HashSet<string> ();
this._local_ids_ro = this._local_ids.read_only_view;
}
var postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
string[] addresses_a = postal_field.split ("\n");
}
HashSet<RoleFieldDetails> role_fds = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
string[] roles_a = roles_field.split ("\n");
}
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
string[] phones_a = phones_field.split ("\n");
foreach (var p in phones_a)
}
var email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
string[] emails_a = emails_field.split (",");
foreach (var e in emails_a)
private void _update_urls ()
{
var url_fds = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var _urls_field = this._cursor.get_string (Trf.Fields.URLS).dup ();
if (_urls_field == null)
"x$enable_vala" = "xyes"], [
VALA_CHECK_PACKAGES([telepathy-glib
gio-2.0
- gee-1.0
+ gee-0.8
libsocialweb-client],
,
have_libsocialweb_backend="no")
EBOOK_REQUIRED=3.5.3
EDATASERVER_REQUIRED=3.5.3.1
ZEITGEIST_REQUIRED=0.3.14
+GEE_REQUIRED=0.8.4
AC_SUBST([TRACKER_SPARQL_MAJOR])
PKG_CHECK_MODULES([GIO], [gio-2.0 >= $GLIB_REQUIRED])
PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1])
-# FIXME: We depend on libgee < 0.7 because 0.7 breaks API. bgo#627746
-PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7],
- have_gee_0_6_x="yes",
- have_gee_0_6_x="no")
-
-AS_IF([test "x$have_gee_0_6_x" != "xyes"], [
- AC_MSG_ERROR([
-Gee 0.6.x required but not installed.
-
-Note that Gee 0.8.x provides gee-0.8 (but gee-1.0 is, confusingly, provided by
-Gee 0.6.x)])
-])
+PKG_CHECK_MODULES([GEE], [gee-0.8 >= $GEE_REQUIRED])
TP_GLIB_REQUIRED=0.19.0
AS_IF([test x$enable_telepathy_backend = xyes], [
AC_SUBST([VAPIDIR])
VALA_CHECK_PACKAGES([gio-2.0
- gee-1.0])
+ gee-0.8])
AS_IF([test x$enable_telepathy_backend = xyes], [
VALA_CHECK_PACKAGES([telepathy-glib])
folks_doc_deps = \
gmodule-2.0 \
gio-2.0 \
- gee-1.0 \
+ gee-0.8 \
folks-internal \
build-conf \
$(NULL)
folks_telepathy_doc_deps = \
gmodule-2.0 \
gio-2.0 \
- gee-1.0 \
+ gee-0.8 \
telepathy-glib \
zeitgeist-1.0 \
tp-lowlevel \
folks_eds_doc_deps = \
gmodule-2.0 \
gio-2.0 \
- gee-1.0 \
+ gee-0.8 \
libebook-1.2 \
libedataserver-1.2 \
build-conf \
folks_libsocialweb_doc_deps = \
gmodule-2.0 \
gio-2.0 \
- gee-1.0 \
+ gee-0.8 \
libsocialweb-client \
build-conf \
folks \
--vapidir=. \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg posix \
--vapi folks-internal.vapi \
-H folks-internal.h \
--pkg gobject-2.0 \
--pkg gmodule-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--includedir folks \
--vapi folks.vapi \
-H folks.h \
}
/**
+ * 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|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 (AbstractFieldDetails left,
+ AbstractFieldDetails 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:
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|673918]]
+ * This can and should be removed next time we break the API.
+ * Note: This uses Gee.HashDataFunc signature, to avoid having to cast.
+ *
+ * @param value the value to hash
+ *
+ * @return the hash value
+ *
+ * @since UNRELEASED
+ */
+ public static uint hash_static (AbstractFieldDetails value)
+ {
+ GLib.return_val_if_fail (value != null, 0);
+
+ AbstractFieldDetails details = (AbstractFieldDetails) value;
+ return details.hash ();
+ }
}
this._debug.print_status.connect (this._debug_print_status);
- this._modules = new HashMap<string,unowned Module> (str_hash, str_equal);
- this._backend_hash = new HashMap<string,Backend> (str_hash, str_equal);
- this._prepared_backends = new HashMap<string,Backend> (str_hash,
- str_equal);
+ this._modules = new HashMap<string,unowned Module> ();
+ this._backend_hash = new HashMap<string,Backend> ();
+ this._prepared_backends = new HashMap<string,Backend> ();
this._prepared_backends_ro = this._prepared_backends.read_only_view;
}
return null;
}
- var modules_final = new HashMap<string, File> (str_hash, str_equal);
+ var modules_final = new HashMap<string, File> ();
foreach (var info in infos)
{
lock (retval._domains)
{
retval._all = false;
- retval._domains = new HashSet<string> (str_hash, str_equal);
+ retval._domains = new HashSet<string> ();
if (debug_flags != null && debug_flags != "")
{
Name: Folks (uninstalled copy)
Description: The Folks meta-contacts library
Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gee-1.0 telepathy-glib >= 0.11.11
+Requires: glib-2.0 gobject-2.0 gee-0.8 telepathy-glib >= 0.11.11
Libs: ${abs_top_builddir}/folks/libfolks.la
Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
glib-2.0
gobject-2.0
gio-2.0
-gee-1.0
+gee-0.8
Name: Folks
Description: The Folks meta-contacts library
Version: @VERSION@
-Requires: glib-2.0 gobject-2.0 gee-1.0
+Requires: glib-2.0 gobject-2.0 gee-0.8
Libs: -L${libdir} -lfolks
Cflags: -I${includedir}
{
/* ``protocols_addrs_set`` will be passed to the new Kf.Persona */
var protocols_addrs_set = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var web_service_addrs_set =
new HashMultiMap<string, WebServiceFieldDetails> (
- null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
/* List of local_ids */
var local_ids = new Gee.HashSet<string> ();
{
/* Stores the Personas contained in this Individual. */
private HashSet<Persona> _persona_set =
- new HashSet<Persona> (direct_hash, direct_equal);
+ new HashSet<Persona> ();
/* Read-only view of the above set */
private Set<Persona> _persona_set_ro;
/* Mapping from PersonaStore -> number of Personas from that store contained
public DateTime? last_im_interaction_datetime
{
- get
+ get
{
if (this._last_im_interaction_datetime == null)
{
*/
public uint call_interaction_count
{
- get
+ get
{
uint counter = 0;
/* Iterate over all personas and sum up their call interaction counts*/
() =>
{
this._im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, ImFieldDetails.hash,
- (EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null, (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
{
this._web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
},
() =>
{
var new_web_service_addresses =
new HashMultiMap<string, WebServiceFieldDetails> (null, null,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
}
/* 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);
/* 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);
() =>
{
this._urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._urls_ro = this._urls.read_only_view;
},
() =>
{
var new_urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
- var urls_set = new HashMap<string, UrlFieldDetails> (null, null,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
+ var urls_set = new HashMap<unowned string,
+ unowned UrlFieldDetails> (
+ null, null, AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
() =>
{
this._phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._phone_numbers_ro = this._phone_numbers.read_only_view;
},
() =>
{
var new_phone_numbers = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_numbers_set = new HashMap<string, PhoneFieldDetails> (
- null, null, (GLib.EqualFunc) PhoneFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
() =>
{
this._email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._email_addresses_ro = this._email_addresses.read_only_view;
},
() =>
{
var new_email_addresses = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var emails_set = new HashMap<string, EmailFieldDetails> (
- null, null, (GLib.EqualFunc) EmailFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
() =>
{
this._roles = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
this._roles_ro = this._roles.read_only_view;
},
() =>
{
var new_roles = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
foreach (var persona in this._persona_set)
{
() =>
{
this._postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
this._postal_addresses_ro = this._postal_addresses.read_only_view;
},
() =>
{
var new_postal_addresses =
new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
foreach (var persona in this._persona_set)
{
() =>
{
this._notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
this._notes_ro = this._notes.read_only_view;
},
() =>
{
var new_notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
foreach (var persona in this._persona_set)
{
* @since 0.5.1
*/
public static Set<string> known_email_aliases =
- new Gee.HashSet<string> (str_hash, str_equal);
+ new Gee.HashSet<string> ();
private static double _DIST_THRESHOLD = 0.70;
private const string _SEPARATORS = "._-+";
--vapidir=$(top_srcdir)/tests/lib/eds \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg folks-test \
--pkg libebook-1.2 \
Value? v2 = Value (typeof (Set));
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
email_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
AbstractFieldDetails.PARAM_TYPE_HOME);
Value? v5 = Value (typeof (Set));
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_1 = new PhoneFieldDetails (this._phone_1);
phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
Value? v6 = Value (typeof (Set));
var pa_fds = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
PostalAddress pa_a = new PostalAddress (this._po_box,
this._extension, this._street, this._locality, this._region,
Value? v8 = Value (typeof (Set));
var notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var note = new NoteFieldDetails (this._note);
notes.add (note);
v8.set_object (notes);
Value? v10 = Value (typeof (Set));
var role_fds = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
var r1 = new Role ("Dr.", "The Nut House Ltd");
r1.role = "The Manager";
var role_fd1 = new RoleFieldDetails (r1);
public void test_email_details ()
{
this._email_count = 0;
- this._email_types = new HashSet<string> (str_hash,
- str_equal);
+ this._email_types = new HashSet<string> ();
this._c1 = new Gee.HashMap<string, Value?> ();
this._c2 = new Gee.HashMap<string, Value?> ();
this._c3 = new Gee.HashMap<string, Value?> ();
{
Gee.HashMap<string, Value?> c1 = new Gee.HashMap<string, Value?> ();
Gee.HashMap<string, Value?> c2 = new Gee.HashMap<string, Value?> ();
- this._found_individuals = new HashSet<string> (str_hash,
- str_equal);
+ this._found_individuals = new HashSet<string> ();
this._main_loop = new GLib.MainLoop (null, false);
Value? v;
{
v1 = Value (typeof (MultiMap));
var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ 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,
- (GLib.HashFunc) WebServiceFieldDetails.hash,
- (GLib.EqualFunc) WebServiceFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
wsa2.set ("lastfm", new WebServiceFieldDetails (this._im_address_2));
v3.set_object (wsa2);
details2.insert (wsk, (owned) v3);
{
v3 = Value (typeof (Set));
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._auto_linkable_email);
emails.add (email_1);
v3.set_object (emails);
foreach (var p in i.personas)
{
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (_email_1);
email_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
AbstractFieldDetails.PARAM_TYPE_OTHER);
public void test_phone_numbers ()
{
this._phones_count = 0;
- this._phone_types = new HashSet<string> (str_hash,
- str_equal);
+ this._phone_types = new HashSet<string> ();
this._c1 = new Gee.HashMap<string, Value?> ();
this._c2 = new Gee.HashMap<string, Value?> ();
this._main_loop = new GLib.MainLoop (null, false);
foreach (var p in i.personas)
{
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails ("bernie@example.org");
email_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
AbstractFieldDetails.PARAM_TYPE_OTHER);
foreach (var p in i.personas)
{
var im_addrs = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs.set ("jabber",
new ImFieldDetails ("bernie@example.org"));
((ImDetails) p).im_addresses = im_addrs;
foreach (var p in i.personas)
{
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_1 = new PhoneFieldDetails ("1234");
phone_1.set_parameter (AbstractFieldDetails.PARAM_TYPE,
AbstractFieldDetails.PARAM_TYPE_HOME);
foreach (var p in i.personas)
{
var role_fds = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
var r1 = new Role ("Dr.", "The Nut House Ltd");
r1.role = "The Manager";
var role_fd1 = new RoleFieldDetails (r1);
--vapidir=$(top_builddir)/tests/lib/telepathy/contactlist/ \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg folks-test \
--pkg kf-test \
this._tp_backend = new TpTests.Backend ();
/* Create a set of the individuals we expect to see */
- this._default_personas = new HashSet<string> (str_hash, str_equal);
+ this._default_personas = new HashSet<string> ();
this._default_personas.add ("travis@example.com");
this._default_personas.add ("olivier@example.com");
public void test_load_and_prep ()
{
var main_loop = new GLib.MainLoop (null, false);
- var backends_expected = new HashSet<string> (str_hash, str_equal);
+ var backends_expected = new HashSet<string> ();
backends_expected.add ("key-file");
backends_expected.add ("telepathy");
private async void test_disabling_async (BackendStore store)
{
- var backends_expected = new HashSet<string> (str_hash, str_equal);
+ var backends_expected = new HashSet<string> ();
backends_expected.add ("key-file");
/* Disable some backends */
/*
* First loading
*/
- backends_expected = new HashSet<string> (str_hash, str_equal);
+ backends_expected = new HashSet<string> ();
backends_expected.add ("key-file");
backends_expected.add ("telepathy");
/*
* Second loading: late disabling
*/
- backends_expected = new HashSet<string> (str_hash, str_equal);
+ backends_expected = new HashSet<string> ();
backends_expected.add ("telepathy");
/* Disable some backends */
/*
* Third loading: late enabling
*/
- backends_expected = new HashSet<string> (str_hash, str_equal);
+ backends_expected = new HashSet<string> ();
backends_expected.add ("key-file");
backends_expected.add ("telepathy");
* Fourth loading: idempotency
*/
- backends_expected = new HashSet<string> (str_hash, str_equal);
+ backends_expected = new HashSet<string> ();
backends_expected.add ("key-file");
backends_expected.add ("telepathy");
--vapidir=$(top_srcdir)/tests/lib/key-file \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg folks-test \
--pkg kf-test \
"jabber=bar@jabber.org\n");
/* Create a set of the individuals we expect to see */
- HashSet<string> expected_individuals = new HashSet<string> (str_hash,
- str_equal);
+ HashSet<string> expected_individuals = new HashSet<string> ();
expected_individuals.add ("0");
expected_individuals.add ("1");
--vapidir=$(top_srcdir)/folks \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--library folks-test \
-H folks-test.h \
--vapidir=. \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg libebook-1.2 \
--pkg libedataserver-1.2 \
--vapidir=. \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg libsocialweb-client \
--pkg folks-libsocialweb \
--vapidir=. \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg gmodule-2.0 \
--pkg dbus-glib-1 \
--pkg telepathy-glib \
--vapidir=. \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
--pkg folks-tracker \
--vapidir=$(top_srcdir)/tests/lib/libsocialweb \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg folks-test \
--pkg folks-libsocialweb \
--vapidir=$(top_srcdir)/backends/telepathy/lib \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg gmodule-2.0 \
--pkg telepathy-glib \
--pkg folks \
assert (persona is Tpf.Persona);
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
emails.add (new_email_fd);
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
phones.add (new_phone_fd);
var urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
urls.add (new_url_fd);
/* set the extended info through Telepathy's ContactInfo interface and
* e.g.
* telepathy:/org/freedesktop/Telepathy/Account/cm/protocol/account:me@example.com
* only in each Individual. */
- this.default_individuals = new HashSet<string> (str_hash, str_equal);
+ this.default_individuals = new HashSet<string> ();
/* me@example.com */
default_individuals.add ("48fa372a81026063187255e3f5c184665d2ed7ce");
* 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<string> (str_hash, str_equal);
+ var ids_remaining = new HashSet<string> ();
foreach (var contact_id in ids_add)
ids_remaining.add (contact_id);
foreach (var id in ids_remaining)
{
- var details = new HashTable<string, GLib.Value?> (str_hash,
- str_equal);
+ var details = new HashTable<string, GLib.Value?> (str_hash, str_equal);
details.insert ("contact", id);
/* we can end up adding the same ID twice, since this async
--vapidir=$(top_srcdir)/tests/lib/tracker \
--pkg gobject-2.0 \
--pkg gio-2.0 \
- --pkg gee-1.0 \
+ --pkg gee-0.8 \
--pkg folks \
--pkg folks-test \
--pkg folks-tracker \
Value? v8 = Value (typeof (Set));
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails.add (email_1);
var email_2 = new EmailFieldDetails (this._email_2);
Value? v9 = Value (typeof (MultiMap));
var im_addrs = new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.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);
Value? v10 = Value (typeof (Set));
var notes = new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
NoteFieldDetails note_fd_1 = new NoteFieldDetails (this._note_1);
notes.add (note_fd_1);
v10.set_object (notes);
Value? v11 = Value (typeof (Set));
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_1 = new PhoneFieldDetails (this._phone_1);
phones.add (phone_1);
Value? v12 = Value (typeof (Set));
var role_fds = new HashSet<RoleFieldDetails> (
- (GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
var r1 = new Role (this._title_1, this._organisation_1);
r1.role = this._role_1;
var role_fd1 = new RoleFieldDetails (r1);
Value? v13 = Value (typeof (Set));
var postal_addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
-
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.equal_static);
var postal_a = new PostalAddress (this._po_box,
this._extension, this._street, this._locality, this._region,
Value? v14 = Value (typeof (Set));
var urls = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var url_1 = new UrlFieldDetails (this._url_1);
urls.add (url_1);
var url_2 = new UrlFieldDetails (this._url_2);
val = Value (typeof (Set));
var emails1 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails1.add (email_1);
val.set_object (emails1);
val = Value (typeof (Set));
var emails2 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_2 = new EmailFieldDetails (this._email_1);
emails2.add (email_2);
val.set_object (emails2);
val = Value (typeof (Set));
var phones1 = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_1 = new PhoneFieldDetails (this._phone_1);
phones1.add (phone_1);
val.set_object (phones1);
val = Value (typeof (Set));
var phones2 = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_2 = new PhoneFieldDetails (this._phone_1);
phones2.add (phone_2);
val.set_object (phones2);
(str_hash, str_equal);
Value? v1 = Value (typeof (MultiMap));
var im_addrs1 = new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs1.set (this._proto, new ImFieldDetails (this._im_address_1));
v1.set_object (im_addrs1);
details1.insert ("im-addresses", (owned) v1);
(str_hash, str_equal);
Value? v3 = Value (typeof (MultiMap));
var im_addrs2 = new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs2.set (this._proto, new ImFieldDetails (this._im_address_2));
v3.set_object (im_addrs2);
details2.insert ("im-addresses", (owned) v3);
val = Value (typeof (Set));
var emails1 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails1.add (email_1);
val.set_object (emails1);
val = Value (typeof (Set));
var emails2 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_2 = new EmailFieldDetails (this._email_1);
emails2.add (email_2);
val.set_object (emails2);
val = Value (typeof (MultiMap));
im_addrs = new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.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);
val = Value (typeof (MultiMap));
im_addrs = new HashMultiMap<string, ImFieldDetails> (null, null,
- (GLib.HashFunc) ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addrs.set ("jabber", new ImFieldDetails (this._im_addr_2));
val.set_object (im_addrs);
details2.insert (
val = Value (typeof (Set));
var emails1 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails1.add (email_1);
val.set_object (emails1);
val = Value (typeof (Set));
var emails2 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_2 = new EmailFieldDetails (this._email_1);
emails2.add (email_2);
val.set_object (emails2);
val = Value (typeof (Set));
var phone_numbers1 = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_number_1 = new PhoneFieldDetails (this._phone_1);
phone_numbers1.add (phone_number_1);
val.set_object (phone_numbers1);
val = Value (typeof (Set));
var phone_numbers2 = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var phone_number_2 = new PhoneFieldDetails (this._phone_2);
phone_numbers2.add (phone_number_2);
val.set_object (phone_numbers2);
Value? v2 = Value (typeof (Set));
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails ("test-1@example.org");
emails.add (email_1);
var email_2 = new EmailFieldDetails ("test-2@example.org");
if (this._has_email ((Trf.Persona) p, this._email_1))
{
var emails1 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails1.add (email_1);
((EmailDetails) p).email_addresses = emails1;
val = Value (typeof (Set));
var emails1 = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var email_1 = new EmailFieldDetails (this._email_1);
emails1.add (email_1);
val.set_object (emails1);
i.notify["email-addresses"].connect (this._notify_emails_cb);
var emails = new HashSet<EmailFieldDetails> (
- (GLib.HashFunc) EmailFieldDetails.hash,
- (GLib.EqualFunc) EmailFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var p1 = new EmailFieldDetails (this._email_1);
emails.add (p1);
var p2 = new EmailFieldDetails (this._email_2);
i.notify["im-addresses"].connect (this._notify_im_addresses_cb);
var im_addresses = new HashMultiMap<string, ImFieldDetails> (
- null, null,
- (GLib.HashFunc)ImFieldDetails.hash,
- (GLib.EqualFunc) ImFieldDetails.equal);
+ null, null, AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
im_addresses.set ("aim", new ImFieldDetails ("one@example.org"));
im_addresses.set ("aim", new ImFieldDetails ("two@example.org"));
Gee.HashSet<NoteFieldDetails> notes =
new HashSet<NoteFieldDetails> (
- (GLib.HashFunc) NoteFieldDetails.hash,
- (GLib.EqualFunc) NoteFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var n = new NoteFieldDetails ("some note");
notes.add ((owned) n);
i.notify["phone-numbers"].connect (this._notify_phones_cb);
var phones = new HashSet<PhoneFieldDetails> (
- (GLib.HashFunc) PhoneFieldDetails.hash,
- (GLib.EqualFunc) PhoneFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var p1 = new PhoneFieldDetails (this._phone_1);
phones.add (p1);
i.notify["postal-addresses"].connect (this._notify_postal_cb);
var addresses = new HashSet<PostalAddressFieldDetails> (
- (GLib.HashFunc) PostalAddressFieldDetails.hash,
- (GLib.EqualFunc) PostalAddressFieldDetails.equal);
+ AbstractFieldDetails<PostalAddress>.hash_static,
+ AbstractFieldDetails<PostalAddress>.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;
i.notify["roles"].connect (this._notify_roles_cb);
Gee.HashSet<RoleFieldDetails> role_fds =
- new HashSet<RoleFieldDetails>
- ((GLib.HashFunc) RoleFieldDetails.hash,
- (GLib.EqualFunc) RoleFieldDetails.equal);
+ new HashSet<RoleFieldDetails> (
+ AbstractFieldDetails<Role>.hash_static,
+ AbstractFieldDetails<Role>.equal_static);
var role = new Role ("some title", "some organisation");
role.role = "some role";
var role_fd = new RoleFieldDetails (role);
i.notify["urls"].connect (this._notify_urls_cb);
var url_fds = new HashSet<UrlFieldDetails> (
- (GLib.HashFunc) UrlFieldDetails.hash,
- (GLib.EqualFunc) UrlFieldDetails.equal);
+ AbstractFieldDetails<string>.hash_static,
+ AbstractFieldDetails<string>.equal_static);
var p1 = new UrlFieldDetails (
this._urls.get (UrlFieldDetails.PARAM_TYPE_BLOG));
p1.set_parameter (AbstractFieldDetails.PARAM_TYPE, UrlFieldDetails.PARAM_TYPE_BLOG);
VALAFLAGS = \
$(AM_VALAFLAGS) \
--vapidir=$(top_builddir)/folks \
- --pkg=gee-1.0 \
+ --pkg=gee-0.8 \
--pkg=libxml-2.0 \
--pkg=folks \
--pkg=build-conf \
--pkg=readline \
--pkg=gobject-2.0 \
--pkg=gio-2.0 \
- --pkg=gee-1.0 \
+ --pkg=gee-0.8 \
--pkg=posix \
--pkg=folks \
--pkg=build-conf \
{
Utils.init ();
- this.commands = new HashMap<string, Command> (str_hash, str_equal);
+ this.commands = new HashMap<string, Command> ();
/* Register the commands we support */
/* FIXME: This should be automatic */