From 670aec4ba8b16fbf35afdf65b65c1904872286dc Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 23 Jul 2012 15:15:20 +0200 Subject: 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. --- libempathy-gtk/empathy-individual-menu.c | 4 ++-- libempathy-gtk/empathy-individual-widget.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'libempathy-gtk') 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); -- cgit v1.2.3