diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-menu.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 10 | ||||
| -rw-r--r-- | libempathy/empathy-contact.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index ed9b560ec..3c9435dc1 100644 --- a/configure.ac +++ b/configure.ac @@ -217,7 +217,7 @@ PKG_CHECK_MODULES(EMPATHY, libpulse-mainloop-glib webkitgtk-3.0 >= $WEBKIT_REQUIRED libsoup-2.4 - gee-0.8 + gee-1.0 ]) PKG_CHECK_MODULES(EMPATHY_CALL, diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 8c2618f04..c485b9b5f 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -107,6 +107,7 @@ 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)); @@ -136,8 +137,7 @@ individual_menu_add_personas (GtkMenuShell *menu, gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show (item); - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) + for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter)) { GtkWidget *image; GtkWidget *contact_item; diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index ad0d999dd..a5eb3c99e 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -1783,12 +1783,13 @@ 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 */ - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) + for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter)) { FolksPersona *persona = gee_iterator_get (iter); add_persona (self, persona); @@ -1797,9 +1798,10 @@ personas_changed_cb (FolksIndividual *individual, } else if (was_showing_personas && !will_show_personas) { + gboolean c; + /* Remove all Personas */ - iter = gee_iterable_iterator (GEE_ITERABLE (personas)); - while (gee_iterator_next (iter)) + for (c = gee_iterator_first (iter); c; c = gee_iterator_next (iter)) { FolksPersona *persona = gee_iterator_get (iter); remove_persona (self, persona); 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); |