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 db8f40cd7b993b391e0b7e40dc3cd6ddb768474f..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,
@@ -69,6 +70,7 @@ typedef enum {
 
 #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;
@@ -105,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,