Merge branch 'gnome-3-8'

[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 2334c63eb6d9f4d37153cfd24befb337cdcf9310..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)
@@ -28,8 +27,6 @@ enum
   SIG_INDIVIDUAL_ADDED,
   SIG_INDIVIDUAL_REMOVED,
   SIG_GROUPS_CHANGED,
-  SIG_TOP_INDIVIDUALS_CHANGED,
-  SIG_FAVOURITES_CHANGED,
   LAST_SIGNAL
 };
 
@@ -63,22 +60,6 @@ empathy_roster_model_default_init (EmpathyRosterModelInterface *iface)
         FOLKS_TYPE_INDIVIDUAL,
         G_TYPE_STRING,
         G_TYPE_BOOLEAN);
-
-  signals[SIG_TOP_INDIVIDUALS_CHANGED] =
-    g_signal_new ("top-individuals-changed",
-        EMPATHY_TYPE_ROSTER_MODEL,
-        G_SIGNAL_RUN_LAST,
-        0, NULL, NULL, NULL,
-        G_TYPE_NONE, 0);
-
-  signals[SIG_FAVOURITES_CHANGED] =
-    g_signal_new ("favourites-changed",
-        EMPATHY_TYPE_ROSTER_MODEL,
-        G_SIGNAL_RUN_LAST,
-        0, NULL, NULL, NULL,
-        G_TYPE_NONE, 2,
-        FOLKS_TYPE_INDIVIDUAL,
-        G_TYPE_BOOLEAN);
 }
 
 /***** Restricted *****/
@@ -103,24 +84,10 @@ empathy_roster_model_fire_groups_changed (EmpathyRosterModel *self,
     const gchar *group,
     gboolean is_member)
 {
-  g_signal_emit (self, signals[SIG_GROUPS_CHANGED], 0, individual, group, is_member);
+  g_signal_emit (self, signals[SIG_GROUPS_CHANGED], 0, individual, group,
+      is_member);
 }
 
-void
-empathy_roster_model_fire_top_individuals_changed (EmpathyRosterModel *self)
-{
-  g_signal_emit (self, signals[SIG_TOP_INDIVIDUALS_CHANGED], 0);
-}
-
-void
-empathy_roster_model_fire_favourites_changed (EmpathyRosterModel *self,
-    FolksIndividual *individual,
-    gboolean favourite)
-{
-  g_signal_emit (self, signals[SIG_FAVOURITES_CHANGED], 0, individual, favourite);
-}
-
-
 /***** Public *****/
 
 /**
@@ -145,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;
@@ -163,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.
- *
- * Return value: (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.
- *
- * Return value: %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);
 }