aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Browaeys <prahal@yahoo.com>2012-07-17 13:37:25 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-19 16:01:42 +0800
commit24d30e15b34b654eff96f4a358801290ebe09ec0 (patch)
tree3b0e3d29fd55f56b73b31f4133d4e59c84469280
parentd563fa078b2a13b3c06b1de626105e0510568e57 (diff)
downloadgsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar.gz
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar.bz2
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar.lz
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar.xz
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.tar.zst
gsoc2013-empathy-24d30e15b34b654eff96f4a358801290ebe09ec0.zip
gee_iterator_first is no more in libgee 0.8
With folks depending upon libgee-0.8 brealage in empathy arise, that is gee_iterator_first is not available. https://bugzilla.gnome.org/show_bug.cgi?id=680152
-rw-r--r--libempathy-gtk/empathy-individual-menu.c4
-rw-r--r--libempathy-gtk/empathy-individual-widget.c10
2 files changed, 6 insertions, 8 deletions
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index c485b9b5f..8c2618f04 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -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;
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index a5eb3c99e..ad0d999dd 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -1783,13 +1783,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);
@@ -1798,10 +1797,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);