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 c624ca4279221cdcce308ad192dc773221c9ed91..1b35f1a1c881de7266c2635e6b31cd57ece99732 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -20,14 +20,14 @@
 #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")
+#define EMPATHY_ROSTER_MODEL_GROUP_PEOPLE_NEARBY _("People Nearby")
+#define EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED _("Ungrouped")
+
 typedef struct _EmpathyRosterModel EmpathyRosterModel;
 typedef struct _EmpathyRosterModelInterface EmpathyRosterModelInterface;
 
@@ -38,11 +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);
-  gboolean (*contact_in_top) (EmpathyRosterModel *self,
-      EmpathyRosterContact *contact);
 };
 
 GType empathy_roster_model_get_type (void);
@@ -75,24 +72,13 @@ void empathy_roster_model_fire_groups_changed (EmpathyRosterModel *self,
     const gchar *group,
     gboolean is_member);
 
-void empathy_roster_model_fire_top_individuals_changed (
-    EmpathyRosterModel *self);
-
-void empathy_roster_model_fire_favourites_changed (EmpathyRosterModel *self,
-    FolksIndividual *individual,
-    gboolean favourite);
-
 /* Public API */
 GList * empathy_roster_model_get_individuals (EmpathyRosterModel *self);
 
-GList * empathy_roster_model_get_groups_for_individual (EmpathyRosterModel *self,
+GList * empathy_roster_model_dup_groups_for_individual (
+    EmpathyRosterModel *self,
     FolksIndividual *individual);
 
-GList * empathy_roster_model_get_top_individuals (EmpathyRosterModel *self);
-
-gboolean empathy_roster_model_contact_in_top (EmpathyRosterModel *self,
-    EmpathyRosterContact *contact);
-
 G_END_DECLS
 
 #endif /* #ifndef __EMPATHY_ROSTER_MODEL_H__*/