aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-23 21:15:20 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-23 21:26:05 +0800
commit670aec4ba8b16fbf35afdf65b65c1904872286dc (patch)
tree8c5abe3fad9d27216f30cb2270c0402b27391323 /libempathy
parentfa8970d7304e81821dd0b1ed6a6704add1904af9 (diff)
downloadgsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar.gz
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar.bz2
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar.lz
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar.xz
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.tar.zst
gsoc2013-empathy-670aec4ba8b16fbf35afdf65b65c1904872286dc.zip
Go back to libgee 0.6.x
It's not clear if 0.8 will be released for GNOME 3.6 so the release team prefers to stick with 0.6 for now. And yeah, gee-1.0 is the 0.6.x series and gee-0.8 the 0.7.x, nice work guys... Revert "gee_iterator_first is no more in libgee 0.8" This reverts commit 24d30e15b34b654eff96f4a358801290ebe09ec0. Revert "libempathy: Port empathy to libgee 0.8." This reverts commit d563fa078b2a13b3c06b1de626105e0510568e57.
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 a2e53b2b9..779d19a19 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -926,7 +926,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, NULL, NULL, NULL, NULL, NULL, NULL);
+ g_free, g_str_hash, g_str_equal);
}
gee_collection_add (GEE_COLLECTION (priv->groups), group);
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 667f6669d..cc518c0b0 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -1129,7 +1129,7 @@ create_individual_from_persona (FolksPersona *persona)
personas = GEE_SET (
gee_hash_set_new (FOLKS_TYPE_PERSONA, g_object_ref, g_object_unref,
- NULL, NULL, NULL, NULL, NULL, NULL));
+ g_direct_hash, g_direct_equal));
gee_collection_add (GEE_COLLECTION (personas), persona);