From f7200ee068d8f959608521737872254f20c5ee55 Mon Sep 17 00:00:00 2001 From: Laurent Contzen Date: Wed, 4 Jul 2012 15:29:41 +0200 Subject: empathy-roster-model: New virtual method _get_groups_for_individual empathy-roster-model-manager: implemented _get_groups_for_individual empathy-roster-view.c: using _get_groups_for_individual https://bugzilla.gnome.org/show_bug.cgi?id=680302 --- libempathy-gtk/empathy-roster-view.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'libempathy-gtk/empathy-roster-view.c') diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index b07a4b252..42b8afe6a 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -338,7 +338,7 @@ individual_added (EmpathyRosterView *self, } else { - GeeSet *groups; + GList *groups, *l; GList *tops; tops = empathy_individual_manager_get_top_individuals ( @@ -351,29 +351,23 @@ individual_added (EmpathyRosterView *self, add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP); } - groups = folks_group_details_get_groups ( - FOLKS_GROUP_DETAILS (individual)); + groups = empathy_roster_model_get_groups_for_individual (self->priv->model, + individual); - if (gee_collection_get_size (GEE_COLLECTION (groups)) > 0) + if (g_list_length (groups) > 0) { - GeeIterator *iter = gee_iterable_iterator (GEE_ITERABLE (groups)); - - while (iter != NULL && gee_iterator_next (iter)) + for (l = groups; l != NULL; l = g_list_next (l)) { - gchar *group = gee_iterator_get (iter); - - add_to_group (self, individual, group); - - g_free (group); + add_to_group (self, individual, l->data); } - - g_clear_object (&iter); } else { /* No group, adds to Ungrouped */ add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_UNGROUPED); } + + g_list_free (groups); } } -- cgit v1.2.3