aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-19 18:59:59 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-02-19 19:01:26 +0800
commit28df2ffe0a5239675deef8cd9624f4cebc08bc32 (patch)
tree53c349530d4e883dc9d5093d78408a6876ea2dd3 /libempathy-gtk
parentab25c881f881f8ef612be720868594ef32e5f148 (diff)
downloadgsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.gz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.bz2
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.lz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.xz
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.tar.zst
gsoc2013-empathy-28df2ffe0a5239675deef8cd9624f4cebc08bc32.zip
Revert "Go back to libgee 0.6.x"
This reverts commit 670aec4ba8b16fbf35afdf65b65c1904872286dc. https://bugzilla.gnome.org/show_bug.cgi?id=680152
Diffstat (limited to 'libempathy-gtk')
-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 03a8ee220..133bd6a80 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 4dab7390c..8cd926260 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -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);