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

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index c485b9b5fb4a01d9476cfc7bba5f6597fd8d2b3f..8c2618f04691f2b81782be413eb3e1143652d781 100644 (file)
--- 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;
   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));
 
   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);
 
   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;
     {
       GtkWidget *image;
       GtkWidget *contact_item;

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index a5eb3c99e94ff595714a20a60ba55f5fcf198afc..ad0d999ddbbece0e11aa6db7634059fb625a8d96 100644 (file)
--- 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)
     {
     }
   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 */
       /* 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);
         {
           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)
     {
     }
   else if (was_showing_personas && !will_show_personas)
     {

-      gboolean c;
-

       /* Remove all Personas */
       /* 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);
         {
           FolksPersona *persona = gee_iterator_get (iter);
           remove_persona (self, persona);