Commit 28df2ffe authored by Guillaume Desmottes's avatar Guillaume Desmottes

Revert "Go back to libgee 0.6.x"

This reverts commit 670aec4b.

https://bugzilla.gnome.org/show_bug.cgi?id=680152
parent ab25c881
......@@ -219,7 +219,7 @@ PKG_CHECK_MODULES(EMPATHY,
libpulse-mainloop-glib
webkitgtk-3.0 >= $WEBKIT_REQUIRED
libsoup-2.4
gee-1.0
gee-0.8
])
# -----------------------------------------------------------
......
......@@ -107,7 +107,6 @@ individual_menu_add_personas (GtkMenuShell *menu,
GeeSet *personas;
GeeIterator *iter;
guint persona_count = 0;
gboolean c;
g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (FOLKS_IS_INDIVIDUAL (individual));
......@@ -137,7 +136,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
iter = gee_iterable_iterator (GEE_ITERABLE (personas));
while (gee_iterator_next (iter))
{
GtkWidget *image;
GtkWidget *contact_item;
......
......@@ -1781,13 +1781,12 @@ personas_changed_cb (FolksIndividual *individual,
}
else if (!was_showing_personas && will_show_personas)
{
gboolean c;
/* Remove the old Individual grid */
individual_grid_destroy (self);
/* Set up all the Persona grids instead */
for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
iter = gee_iterable_iterator (GEE_ITERABLE (personas));
while (gee_iterator_next (iter))
{
FolksPersona *persona = gee_iterator_get (iter);
add_persona (self, persona);
......@@ -1796,10 +1795,9 @@ personas_changed_cb (FolksIndividual *individual,
}
else if (was_showing_personas && !will_show_personas)
{
gboolean c;
/* Remove all Personas */
for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter))
iter = gee_iterable_iterator (GEE_ITERABLE (personas));
while (gee_iterator_next (iter))
{
FolksPersona *persona = gee_iterator_get (iter);
remove_persona (self, persona);
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment