EmpathyRosterModelManager *self)
{
empathy_roster_model_fire_groups_changed (EMPATHY_ROSTER_MODEL (self),
- individual,
- group,
- is_member);
+ individual, group, is_member);
}
static void
return empathy_individual_manager_get_members (self->priv->manager);
}
+static GList *
+empathy_roster_model_manager_get_groups_for_individual (EmpathyRosterModel *model,
+ FolksIndividual *individual)
+{
+ GList *groups_list = NULL;
+ GeeSet *groups_set;
+
+ groups_set = folks_group_details_get_groups (FOLKS_GROUP_DETAILS (individual));
+ if (gee_collection_get_size (GEE_COLLECTION (groups_set)) > 0)
+ {
+ GeeIterator *iter = gee_iterable_iterator (GEE_ITERABLE (groups_set));
+
+ while (iter != NULL && gee_iterator_next (iter))
+ {
+ groups_list = g_list_prepend (groups_list, gee_iterator_get (iter));
+ }
+ g_clear_object (&iter);
+ }
+
+ return groups_list;
+}
+
static void
roster_model_iface_init (EmpathyRosterModelInterface *iface)
{
iface->get_individuals = empathy_roster_model_manager_get_individuals;
+ iface->get_groups_for_individual = empathy_roster_model_manager_get_groups_for_individual;
}
return (* iface->get_individuals) (self);
}
+
+GList *
+empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
+ FolksIndividual *individual)
+{
+ EmpathyRosterModelInterface *iface;
+
+ g_return_val_if_fail (EMPATHY_IS_ROSTER_MODEL (self), NULL);
+
+ iface = EMPATHY_ROSTER_MODEL_GET_IFACE (self);
+ g_return_val_if_fail (iface->get_groups_for_individual != NULL, NULL);
+
+ return (* iface->get_groups_for_individual) (self, individual);
+}
/* Virtual table */
GList * (* get_individuals) (EmpathyRosterModel *self);
+ GList * (*get_groups_for_individual) (EmpathyRosterModel *self,
+ FolksIndividual *individual);
};
GType empathy_roster_model_get_type (void);
/* Public API */
GList * empathy_roster_model_get_individuals (EmpathyRosterModel *self);
+GList * empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
+ FolksIndividual *individual);
+
G_END_DECLS
#endif /* #ifndef __EMPATHY_ROSTER_MODEL_H__*/
}
else
{
- GeeSet *groups;
+ GList *groups, *l;
GList *tops;
tops = empathy_individual_manager_get_top_individuals (
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);
}
}