aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-19 18:59:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-19 19:01:26 +0800
commit28df2ffe0a5239675deef8cd9624f4cebc08bc32 (patch)
tree53c349530d4e883dc9d5093d78408a6876ea2dd3 /libempathy
parentab25c881f881f8ef612be720868594ef32e5f148 (diff)
downloadgsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.gz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.bz2
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.lz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.xz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.zst
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.zip
Revert "Go back to libgee 0.6.x"
This reverts commit 670aec4ba8b16fbf35afdf65b65c1904872286dc. https://bugzilla.gnome.org/show_bug.cgi?id=680152
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-contact.c2
-rw-r--r--libempathy/empathy-utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 83f59f4c6..9f5a95623 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -923,7 +923,7 @@ empathy_contact_change_group (EmpathyContact *contact, const gchar *group,
if (priv->groups == NULL)
{
priv->groups = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup,
- g_free, g_str_hash, g_str_equal);
+ g_free, NULL, NULL, NULL, NULL, NULL, NULL);
}
gee_collection_add (GEE_COLLECTION (priv->groups), group);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 191544fbf..000d61e6a 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -1144,7 +1144,7 @@ create_individual_from_persona (FolksPersona *persona)
personas = GEE_SET (
gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
- g_direct_hash, g_direct_equal));
+ NULL, NULL, NULL, NULL, NULL, NULL));
gee_collection_add (GEE_COLLECTION (personas), persona);