Merge remote-tracking branch 'origin/gnome-3-8'

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

diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 71b204231c35a0efc985915604847fbcc88c3d8f..1b35f1a1c881de7266c2635e6b31cd57ece99732 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -20,12 +20,8 @@
 #ifndef __EMPATHY_ROSTER_MODEL_H__
 #define __EMPATHY_ROSTER_MODEL_H__
 
-#include <glib-object.h>
-
 #include <folks/folks.h>
 
-#include <libempathy-gtk/empathy-roster-contact.h>
-
 G_BEGIN_DECLS
 
 #define EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP _("Top Contacts")
@@ -42,9 +38,8 @@ struct _EmpathyRosterModelInterface
 
   /* Virtual table */
   GList * (* get_individuals) (EmpathyRosterModel *self);
-  GList * (*get_groups_for_individual) (EmpathyRosterModel *self,
+  GList * (*dup_groups_for_individual) (EmpathyRosterModel *self,
       FolksIndividual *individual);
-  GList * (*get_top_individuals) (EmpathyRosterModel *self);
 };
 
 GType empathy_roster_model_get_type (void);
@@ -80,12 +75,10 @@ void empathy_roster_model_fire_groups_changed (EmpathyRosterModel *self,
 /* Public API */
 GList * empathy_roster_model_get_individuals (EmpathyRosterModel *self);
 
-GList * empathy_roster_model_get_groups_for_individual (
+GList * empathy_roster_model_dup_groups_for_individual (
     EmpathyRosterModel *self,
     FolksIndividual *individual);
 
-GList * empathy_roster_model_get_top_individuals (EmpathyRosterModel *self);
-
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_ROSTER_MODEL_H__*/