individual-menu: stop creating single_individual

[empathy.git] / libempathy-gtk / empathy-roster-model.c

diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index f1e596029e549973ffd609b781dea8b0c486d677..994ab9896435704e67196468d7a48ebce9d3b410 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "config.h"
-
 #include "empathy-roster-model.h"
 
 G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
@@ -113,17 +112,17 @@ empathy_roster_model_get_individuals (EmpathyRosterModel *self)
 }
 
 /**
- * empathy_roster_model_get_groups_for_individual:
+ * empathy_roster_model_dup_groups_for_individual:
  * @self: a #EmpathyRosterModel
  * @individual: a #FolksIndidivual
  *
  * Returns the groups of which @individual is a member of.
  *
- * Returns: (transfer container): a #GList of (const gchar *) representing the
+ * Returns: (transfer full): a #GList of (gchar *) representing the
  * groups of @individual
  */
 GList *
-empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
+empathy_roster_model_dup_groups_for_individual (EmpathyRosterModel *self,
     FolksIndividual *individual)
 {
   EmpathyRosterModelInterface *iface;
@@ -131,53 +130,7 @@ empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
   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);
-}
-
-/**
- * empathy_roster_model_get_top_individuals:
- * @self: a #EmpathyRosterModel
- *
- * Returns a list of the top_individuals.
- *
- * Returns: (transfer none): a #GList of #FolksIndividual
- */
-GList *
-empathy_roster_model_get_top_individuals (EmpathyRosterModel *self)
-{
-  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_top_individuals != NULL, NULL);
-
-  return (* iface->get_top_individuals) (self);
-}
-
-/**
- * empathy_roster_model_contact_in_top:
- * @self: a #EmpathyRosterModel
- * @contact: a #EmpathyRosterContact
- *
- * Checks if the passed #EmpathyRosterContact should be displayed in
- * top contacts.
- *
- * Returns: %TRUE if it should be displayed in top contacts, %FALSE
- * if not
- */
-gboolean
-empathy_roster_model_contact_in_top (EmpathyRosterModel *self,
-    EmpathyRosterContact *contact)
-{
-  EmpathyRosterModelInterface *iface;
-
-  g_return_val_if_fail (EMPATHY_IS_ROSTER_MODEL (self), FALSE);
-
-  iface = EMPATHY_ROSTER_MODEL_GET_IFACE (self);
-  g_return_val_if_fail (iface->contact_in_top != NULL, FALSE);
+  g_return_val_if_fail (iface->dup_groups_for_individual != NULL, NULL);
 
-  return (* iface->contact_in_top) (self, contact);
+  return (* iface->dup_groups_for_individual) (self, individual);
 }