Merge branch 'people-nearby-fake-group-613558'

[empathy.git] / libempathy-gtk / empathy-contact-list-store.h

diff --git a/libempathy-gtk/empathy-contact-list-store.h b/libempathy-gtk/empathy-contact-list-store.h
index c46e9e8317b8e97f664261b17185fc18bc2b0091..b8008cadb95fa72bf00320ef53c65cffef2f5583 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.h
+++ b/libempathy-gtk/empathy-contact-list-store.h
@@ -53,8 +53,9 @@ typedef enum {
        EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR,
        EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE,
        EMPATHY_CONTACT_LIST_STORE_COL_NAME,
+       EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE,
        EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
-       EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE,
+       EMPATHY_CONTACT_LIST_STORE_COL_COMPACT,
        EMPATHY_CONTACT_LIST_STORE_COL_CONTACT,
        EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP,
        EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE,
@@ -63,9 +64,14 @@ typedef enum {
        EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
        EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
        EMPATHY_CONTACT_LIST_STORE_COL_FLAGS,
-       EMPATHY_CONTACT_LIST_STORE_COL_COUNT
+       EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP,
+       EMPATHY_CONTACT_LIST_STORE_COL_COUNT,
 } EmpathyContactListStoreCol;
 
+#define EMPATHY_CONTACT_LIST_STORE_UNGROUPED _("Ungrouped")
+#define EMPATHY_CONTACT_LIST_STORE_FAVORITE  _("Favorite People")
+#define EMPATHY_CONTACT_LIST_STORE_PEOPLE_NEARBY _("People Nearby")
+
 struct _EmpathyContactListStore {
        GtkTreeStore parent;
        gpointer priv;
@@ -101,7 +107,8 @@ gboolean                   empathy_contact_list_store_row_separator_func (GtkTre
                                                                         gpointer                    data);
 gchar *                    empathy_contact_list_store_get_parent_group   (GtkTreeModel               *model,
                                                                         GtkTreePath                *path,
-                                                                        gboolean                   *path_is_group);
+                                                                        gboolean                   *path_is_group,
+                                                                        gboolean                   *is_fake_group);
 gboolean                   empathy_contact_list_store_search_equal_func  (GtkTreeModel               *model,
                                                                         gint                        column,
                                                                         const gchar                *key,
@@ -109,9 +116,6 @@ gboolean                   empathy_contact_list_store_search_equal_func  (GtkTre
                                                                         gpointer                    search_data);
 GdkPixbuf *                contact_list_store_get_contact_status_icon ( EmpathyContactListStore *store,
                                                                         EmpathyContact             *contact);
-GdkPixbuf *                contact_list_store_get_contact_status_icon_with_icon_name (EmpathyContactListStore *store,
-                                                                        EmpathyContact             *contact,
-                                                                        const gchar                *status_icon_name);
 
 G_END_DECLS