]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-contact-list-store.c
Merge branch 'people-nearby-fake-group-613558'
[empathy.git] / libempathy-gtk / empathy-contact-list-store.c
index c516dbf7cff8f87c4ff432072b31f6863bd2e727..6b35b082440ab1835f2f35578828a1eb4bec67b7 100644 (file)
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
@@ -60,11 +61,13 @@ typedef struct {
        gboolean                    show_avatars;
        gboolean                    show_groups;
        gboolean                    is_compact;
+       gboolean                    show_protocols;
        gboolean                    show_active;
        EmpathyContactListStoreSort sort_criterium;
        guint                       inhibit_active;
        guint                       setup_idle_id;
        gboolean                    dispose_has_run;
+       GHashTable                  *status_icons;
 } EmpathyContactListStorePriv;
 
 typedef struct {
@@ -103,6 +106,10 @@ static void             contact_list_store_members_changed_cb        (EmpathyCon
                                                                      gchar                         *message,
                                                                      gboolean                       is_member,
                                                                      EmpathyContactListStore       *store);
+static void             contact_list_store_favourites_changed_cb     (EmpathyContactList            *list_iface,
+                                                                     EmpathyContact                *contact,
+                                                                     gboolean                       is_favourite,
+                                                                     EmpathyContactListStore       *store);
 static void             contact_list_store_member_renamed_cb         (EmpathyContactList            *list_iface,
                                                                      EmpathyContact                *old_contact,
                                                                      EmpathyContact                *new_contact,
@@ -140,7 +147,8 @@ static void             contact_list_store_get_group                 (EmpathyCon
                                                                      const gchar                   *name,
                                                                      GtkTreeIter                   *iter_group_to_set,
                                                                      GtkTreeIter                   *iter_separator_to_set,
-                                                                     gboolean                      *created);
+                                                                     gboolean                      *created,
+                                                                     gboolean                      is_fake_group);
 static gint             contact_list_store_state_sort_func           (GtkTreeModel                  *model,
                                                                      GtkTreeIter                   *iter_a,
                                                                      GtkTreeIter                   *iter_b,
@@ -165,6 +173,7 @@ enum {
        PROP_CONTACT_LIST,
        PROP_SHOW_OFFLINE,
        PROP_SHOW_AVATARS,
+       PROP_SHOW_PROTOCOLS,
        PROP_SHOW_GROUPS,
        PROP_IS_COMPACT,
        PROP_SORT_CRITERIUM
@@ -188,6 +197,10 @@ contact_list_store_iface_setup (gpointer user_data)
                          "members-changed",
                          G_CALLBACK (contact_list_store_members_changed_cb),
                          store);
+       g_signal_connect (priv->list,
+                         "favourites-changed",
+                         G_CALLBACK (contact_list_store_favourites_changed_cb),
+                         store);
        g_signal_connect (priv->list,
                          "groups-changed",
                          G_CALLBACK (contact_list_store_groups_changed_cb),
@@ -255,6 +268,14 @@ empathy_contact_list_store_class_init (EmpathyContactListStoreClass *klass)
                                                                "avatars for contacts",
                                                                TRUE,
                                                                G_PARAM_READWRITE));
+        g_object_class_install_property (object_class,
+                                         PROP_SHOW_PROTOCOLS,
+                                         g_param_spec_boolean ("show-protocols",
+                                                               "Show Protocols",
+                                                               "Whether contact list should display "
+                                                               "protocols for contacts",
+                                                               FALSE,
+                                                               G_PARAM_READWRITE));
         g_object_class_install_property (object_class,
                                          PROP_SHOW_GROUPS,
                                          g_param_spec_boolean ("show-groups",
@@ -292,9 +313,11 @@ empathy_contact_list_store_init (EmpathyContactListStore *store)
        store->priv = priv;
        priv->show_avatars = TRUE;
        priv->show_groups = TRUE;
+       priv->show_protocols = FALSE;
        priv->inhibit_active = g_timeout_add_seconds (ACTIVE_USER_WAIT_TO_ENABLE_TIME,
                                                      (GSourceFunc) contact_list_store_inibit_active_cb,
                                                      store);
+       priv->status_icons = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
        contact_list_store_setup (store);
 }
 
@@ -324,6 +347,9 @@ contact_list_store_dispose (GObject *object)
        g_signal_handlers_disconnect_by_func (priv->list,
                                              G_CALLBACK (contact_list_store_members_changed_cb),
                                              object);
+       g_signal_handlers_disconnect_by_func (priv->list,
+                                             G_CALLBACK (contact_list_store_favourites_changed_cb),
+                                             object);
        g_signal_handlers_disconnect_by_func (priv->list,
                                              G_CALLBACK (contact_list_store_groups_changed_cb),
                                              object);
@@ -337,6 +363,7 @@ contact_list_store_dispose (GObject *object)
                g_source_remove (priv->setup_idle_id);
        }
 
+       g_hash_table_destroy (priv->status_icons);
        G_OBJECT_CLASS (empathy_contact_list_store_parent_class)->dispose (object);
 }
 
@@ -360,6 +387,9 @@ contact_list_store_get_property (GObject    *object,
        case PROP_SHOW_AVATARS:
                g_value_set_boolean (value, priv->show_avatars);
                break;
+       case PROP_SHOW_PROTOCOLS:
+               g_value_set_boolean (value, priv->show_protocols);
+               break;
        case PROP_SHOW_GROUPS:
                g_value_set_boolean (value, priv->show_groups);
                break;
@@ -398,6 +428,10 @@ contact_list_store_set_property (GObject      *object,
                empathy_contact_list_store_set_show_avatars (EMPATHY_CONTACT_LIST_STORE (object),
                                                            g_value_get_boolean (value));
                break;
+       case PROP_SHOW_PROTOCOLS:
+               empathy_contact_list_store_set_show_protocols (EMPATHY_CONTACT_LIST_STORE (object),
+                                                           g_value_get_boolean (value));
+               break;
        case PROP_SHOW_GROUPS:
                empathy_contact_list_store_set_show_groups (EMPATHY_CONTACT_LIST_STORE (object),
                                                            g_value_get_boolean (value));
@@ -517,6 +551,42 @@ empathy_contact_list_store_set_show_avatars (EmpathyContactListStore *store,
        g_object_notify (G_OBJECT (store), "show-avatars");
 }
 
+
+gboolean
+empathy_contact_list_store_get_show_protocols (EmpathyContactListStore *store)
+{
+       EmpathyContactListStorePriv *priv;
+
+       g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store), TRUE);
+
+       priv = GET_PRIV (store);
+
+       return priv->show_protocols;
+}
+
+void
+empathy_contact_list_store_set_show_protocols (EmpathyContactListStore *store,
+                                           gboolean                show_protocols)
+{
+       EmpathyContactListStorePriv *priv;
+       GtkTreeModel               *model;
+
+       g_return_if_fail (EMPATHY_IS_CONTACT_LIST_STORE (store));
+
+       priv = GET_PRIV (store);
+
+       priv->show_protocols = show_protocols;
+
+       model = GTK_TREE_MODEL (store);
+
+       gtk_tree_model_foreach (model,
+                               (GtkTreeModelForeachFunc)
+                               contact_list_store_update_list_mode_foreach,
+                               store);
+
+       g_object_notify (G_OBJECT (store), "show-protocols");
+}
+
 gboolean
 empathy_contact_list_store_get_show_groups (EmpathyContactListStore *store)
 {
@@ -658,11 +728,13 @@ empathy_contact_list_store_row_separator_func (GtkTreeModel *model,
 gchar *
 empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
                                            GtkTreePath  *path,
-                                           gboolean     *path_is_group)
+                                           gboolean     *path_is_group,
+                                           gboolean     *is_fake_group)
 {
        GtkTreeIter  parent_iter, iter;
        gchar       *name = NULL;
        gboolean     is_group;
+       gboolean     fake;
 
        g_return_val_if_fail (GTK_IS_TREE_MODEL (model), NULL);
 
@@ -692,6 +764,7 @@ empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
                gtk_tree_model_get (model, &iter,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, &is_group,
                                    EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name,
+                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake,
                                    -1);
                if (!is_group) {
                        g_free (name);
@@ -703,6 +776,9 @@ empathy_contact_list_store_get_parent_group (GtkTreeModel *model,
                *path_is_group = TRUE;
        }
 
+       if (is_fake_group != NULL)
+               *is_fake_group = fake;
+
        return name;
 }
 
@@ -753,12 +829,13 @@ contact_list_store_setup (EmpathyContactListStore *store)
 {
        EmpathyContactListStorePriv *priv;
        GType types[] = {
-               G_TYPE_STRING,        /* Status icon-name */
+               GDK_TYPE_PIXBUF,      /* Status pixbuf */
                GDK_TYPE_PIXBUF,      /* Avatar pixbuf */
                G_TYPE_BOOLEAN,       /* Avatar pixbuf visible */
                G_TYPE_STRING,        /* Name */
+               G_TYPE_UINT,          /* Presence type */
                G_TYPE_STRING,        /* Status string */
-               G_TYPE_BOOLEAN,       /* Show status */
+               G_TYPE_BOOLEAN,       /* Compact view */
                EMPATHY_TYPE_CONTACT, /* Contact type */
                G_TYPE_BOOLEAN,       /* Is group */
                G_TYPE_BOOLEAN,       /* Is active */
@@ -767,6 +844,7 @@ contact_list_store_setup (EmpathyContactListStore *store)
                G_TYPE_BOOLEAN,       /* Can make audio calls */
                G_TYPE_BOOLEAN,       /* Can make video calls */
                EMPATHY_TYPE_CONTACT_LIST_FLAGS, /* Flags */
+               G_TYPE_BOOLEAN,       /* Is a fake group */
        };
 
        priv = GET_PRIV (store);
@@ -859,6 +937,25 @@ contact_list_store_members_changed_cb (EmpathyContactList      *list_iface,
        }
 }
 
+static void
+contact_list_store_favourites_changed_cb (EmpathyContactList      *list_iface,
+                                         EmpathyContact          *contact,
+                                         gboolean                 is_favourite,
+                                         EmpathyContactListStore *store)
+{
+       EmpathyContactListStorePriv *priv;
+
+       priv = GET_PRIV (store);
+
+       DEBUG ("Contact %s (%d) is %s a favourite",
+               empathy_contact_get_id (contact),
+               empathy_contact_get_handle (contact),
+               is_favourite ? "now" : "no longer");
+
+       contact_list_store_remove_contact (store, contact);
+       contact_list_store_add_contact (store, contact);
+}
+
 static void
 contact_list_store_member_renamed_cb (EmpathyContactList      *list_iface,
                                      EmpathyContact          *old_contact,
@@ -911,6 +1008,27 @@ contact_list_store_groups_changed_cb (EmpathyContactList      *list_iface,
        priv->show_active = show_active;
 }
 
+static void
+add_contact_to_store (GtkTreeStore *store,
+                     GtkTreeIter *iter,
+                     EmpathyContact *contact,
+                     EmpathyContactListFlags flags)
+{
+       gtk_tree_store_set (store, iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
+                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
+                             empathy_contact_get_capabilities (contact) &
+                               EMPATHY_CAPABILITIES_AUDIO,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
+                             empathy_contact_get_capabilities (contact) &
+                               EMPATHY_CAPABILITIES_VIDEO,
+                           EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
+                           -1);
+}
+
 static void
 contact_list_store_add_contact (EmpathyContactListStore *store,
                                EmpathyContact          *contact)
@@ -920,6 +1038,7 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
        GList                      *groups = NULL, *l;
        TpConnection               *connection;
        EmpathyContactListFlags     flags = 0;
+       char                       *protocol_name;
 
        priv = GET_PRIV (store);
 
@@ -937,8 +1056,29 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
                flags = empathy_contact_manager_get_flags_for_connection (
                        EMPATHY_CONTACT_MANAGER (priv->list), connection);
        }
-       /* If no groups just add it at the top level. */
+
+       tp_connection_parse_object_path (connection, &protocol_name, NULL);
+
        if (!groups) {
+#if HAVE_FAVOURITE_CONTACTS
+               GtkTreeIter iter_group;
+
+               if (!tp_strdiff (protocol_name, "local-xmpp")) {
+                       /* these are People Nearby */
+                       contact_list_store_get_group (store,
+                               EMPATHY_CONTACT_LIST_STORE_PEOPLE_NEARBY,
+                               &iter_group, NULL, NULL, TRUE);
+               } else {
+                       contact_list_store_get_group (store,
+                               EMPATHY_CONTACT_LIST_STORE_UNGROUPED,
+                               &iter_group, NULL, NULL, TRUE);
+               }
+
+               gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
+                                            &iter_group, NULL);
+#else
+               /* FIXME: remove this in 2.31.x */
+               /* If no groups just add it at the top level. */
                GtkTreeModel *model = GTK_TREE_MODEL (store);
 
                if (gtk_tree_model_get_iter_first (model, &iter)) do {
@@ -957,48 +1097,43 @@ contact_list_store_add_contact (EmpathyContactListStore *store,
                } while (gtk_tree_model_iter_next (model, &iter));
 
                gtk_tree_store_append (GTK_TREE_STORE (store), &iter, NULL);
-               gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_AUDIO,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_VIDEO,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-                                   -1);
+#endif
+
+               add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
        }
 
+       g_free (protocol_name);
+
        /* Else add to each group. */
        for (l = groups; l; l = l->next) {
                GtkTreeIter iter_group;
 
-               contact_list_store_get_group (store, l->data, &iter_group, NULL, NULL);
+               contact_list_store_get_group (store, l->data, &iter_group, NULL, NULL, FALSE);
 
                gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
                                             &iter_group, NULL);
-               gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, contact,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_AUDIO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_AUDIO,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_CAN_VIDEO_CALL,
-                                     empathy_contact_get_capabilities (contact) &
-                                       EMPATHY_CAPABILITIES_VIDEO,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_FLAGS, flags,
-                                   -1);
+
+               add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
                g_free (l->data);
        }
        g_list_free (groups);
 
-       contact_list_store_contact_update (store, contact);
+#ifdef HAVE_FAVOURITE_CONTACTS
+       if (empathy_contact_list_is_favourite (priv->list, contact)) {
+       /* Add contact to the fake 'Favorites' group */
+               GtkTreeIter iter_group;
+
+               contact_list_store_get_group (store, EMPATHY_CONTACT_LIST_STORE_FAVORITE,
+                       &iter_group, NULL, NULL, TRUE);
+
+               gtk_tree_store_insert_after (GTK_TREE_STORE (store), &iter,
+                                            &iter_group, NULL);
+
+               add_contact_to_store (GTK_TREE_STORE (store), &iter, contact, flags);
+       }
+#endif
 
+       contact_list_store_contact_update (store, contact);
 }
 
 static void
@@ -1056,6 +1191,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
        gboolean                    do_set_refresh = FALSE;
        gboolean                    show_avatar = FALSE;
        GdkPixbuf                  *pixbuf_avatar;
+       GdkPixbuf                  *pixbuf_status;
 
        priv = GET_PRIV (store);
 
@@ -1149,14 +1285,18 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
                show_avatar = TRUE;
        }
        pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
+       pixbuf_status = contact_list_store_get_contact_status_icon (store, contact);
        for (l = iters; l && set_model; l = l->next) {
                gtk_tree_store_set (GTK_TREE_STORE (store), l->data,
-                                   EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, empathy_icon_name_for_contact (contact),
+                                   EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
                                    EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR, pixbuf_avatar,
                                    EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
                                    EMPATHY_CONTACT_LIST_STORE_COL_NAME, empathy_contact_get_name (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_STATUS, empathy_contact_get_status (contact),
-                                   EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact,
+                                   EMPATHY_CONTACT_LIST_STORE_COL_PRESENCE_TYPE,
+                                     empathy_contact_get_presence (contact),
+                                   EMPATHY_CONTACT_LIST_STORE_COL_STATUS,
+                                     empathy_contact_get_presence_message (contact),
+                                   EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, FALSE,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_ONLINE, now_online,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
@@ -1330,7 +1470,8 @@ contact_list_store_get_group (EmpathyContactListStore *store,
                              const gchar            *name,
                              GtkTreeIter            *iter_group_to_set,
                              GtkTreeIter            *iter_separator_to_set,
-                             gboolean               *created)
+                             gboolean               *created,
+                             gboolean               is_fake_group)
 {
        EmpathyContactListStorePriv *priv;
        GtkTreeModel                *model;
@@ -1361,6 +1502,7 @@ contact_list_store_get_group (EmpathyContactListStore *store,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_GROUP, TRUE,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_ACTIVE, FALSE,
                                    EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, FALSE,
+                                   EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, is_fake_group,
                                    -1);
 
                if (iter_group_to_set) {
@@ -1402,45 +1544,120 @@ contact_list_store_get_group (EmpathyContactListStore *store,
        }
 }
 
+static gint
+get_position (const char **strv,
+             const char *str)
+{
+       int i;
+
+       for (i = 0; strv[i] != NULL; i++) {
+               if (!tp_strdiff (strv[i], str))
+                       return i;
+       }
+
+       return -1;
+}
+
+static gint
+compare_separator_and_groups (gboolean is_separator_a,
+                             gboolean is_separator_b,
+                             const gchar *name_a,
+                             const gchar *name_b,
+                             EmpathyContact *contact_a,
+                             EmpathyContact *contact_b,
+                             gboolean fake_group_a,
+                             gboolean fake_group_b)
+{
+       /* these two lists are the sorted list of fake groups to include at the
+        * top and bottom of the roster */
+       const char *top_groups[] = {
+               EMPATHY_CONTACT_LIST_STORE_FAVORITE,
+               NULL
+       };
+
+       const char *bottom_groups[] = {
+               EMPATHY_CONTACT_LIST_STORE_UNGROUPED,
+               NULL
+       };
+
+       if (is_separator_a || is_separator_b) {
+               /* We have at least one separator */
+               if (is_separator_a) {
+                       return -1;
+               } else if (is_separator_b) {
+                       return 1;
+               }
+       }
+
+       /* One group and one contact */
+       if (!contact_a && contact_b) {
+               return 1;
+       } else if (contact_a && !contact_b) {
+               return -1;
+       } else if (!contact_a && !contact_b) {
+               gboolean a_in_top, b_in_top, a_in_bottom, b_in_bottom;
+
+               a_in_top = fake_group_a &&
+                       tp_strv_contains (top_groups, name_a);
+               b_in_top = fake_group_b &&
+                       tp_strv_contains (top_groups, name_b);
+               a_in_bottom = fake_group_b &&
+                       tp_strv_contains (bottom_groups, name_a);
+               b_in_bottom = fake_group_b &&
+                       tp_strv_contains (bottom_groups, name_b);
+
+               if (a_in_top && b_in_top) {
+                       /* compare positions */
+                       return CLAMP (get_position (top_groups, name_a) -
+                                     get_position (top_groups, name_b),
+                                     -1, 1);
+               } else if (a_in_bottom && b_in_bottom) {
+                       /* compare positions */
+                       return CLAMP (get_position (bottom_groups, name_a) -
+                                     get_position (bottom_groups, name_b),
+                                     -1, 1);
+               } else if (a_in_top || b_in_bottom) {
+                       return -1;
+               } else if (b_in_top || a_in_bottom) {
+                       return 1;
+               } else {
+                       return g_utf8_collate (name_a, name_b);
+               }
+       }
+
+       /* Two contacts, ordering depends of the sorting policy */
+       return 0;
+}
+
 static gint
 contact_list_store_state_sort_func (GtkTreeModel *model,
                                    GtkTreeIter  *iter_a,
                                    GtkTreeIter  *iter_b,
                                    gpointer      user_data)
 {
-       gint            ret_val = 0;
+       gint            ret_val;
        gchar          *name_a, *name_b;
        gboolean        is_separator_a, is_separator_b;
        EmpathyContact *contact_a, *contact_b;
+       gboolean       fake_group_a, fake_group_b;
 
        gtk_tree_model_get (model, iter_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
                            -1);
        gtk_tree_model_get (model, iter_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
                            -1);
 
-       /* Separator or group? */
-       if (is_separator_a || is_separator_b) {
-               if (is_separator_a) {
-                       ret_val = -1;
-               } else if (is_separator_b) {
-                       ret_val = 1;
-               }
-       } else if (!contact_a && contact_b) {
-               ret_val = 1;
-       } else if (contact_a && !contact_b) {
-               ret_val = -1;
-       } else if (!contact_a && !contact_b) {
-               /* Handle groups */
-               ret_val = g_utf8_collate (name_a, name_b);
-       }
+       ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
+               name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
 
-       if (ret_val) {
+       if (ret_val != 0) {
                goto free_and_out;
        }
 
@@ -1479,38 +1696,28 @@ contact_list_store_name_sort_func (GtkTreeModel *model,
 {
        gchar         *name_a, *name_b;
        EmpathyContact *contact_a, *contact_b;
-       gboolean       is_separator_a, is_separator_b;
+       gboolean       is_separator_a = FALSE, is_separator_b = FALSE;
        gint           ret_val;
+       gboolean       fake_group_a, fake_group_b;
 
        gtk_tree_model_get (model, iter_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_a,
                            EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_a,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_a,
                            -1);
        gtk_tree_model_get (model, iter_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_NAME, &name_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact_b,
                            EMPATHY_CONTACT_LIST_STORE_COL_IS_SEPARATOR, &is_separator_b,
+                           EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
                            -1);
 
-       /* If contact is NULL it means it's a group. */
+       ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
+               name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
 
-       if (is_separator_a || is_separator_b) {
-               if (is_separator_a) {
-                       ret_val = -1;
-               } else if (is_separator_b) {
-                       ret_val = 1;
-               }
-       } else if (!contact_a && contact_b) {
-               ret_val = 1;
-       } else if (contact_a && !contact_b) {
-               ret_val = -1;
-       } else {
+       if (ret_val == 0)
                ret_val = g_utf8_collate (name_a, name_b);
-       }
-
-       g_free (name_a);
-       g_free (name_b);
 
        if (contact_a) {
                g_object_unref (contact_a);
@@ -1581,7 +1788,9 @@ contact_list_store_update_list_mode_foreach (GtkTreeModel           *model,
                                             EmpathyContactListStore *store)
 {
        EmpathyContactListStorePriv *priv;
-       gboolean                    show_avatar = FALSE;
+       gboolean                     show_avatar = FALSE;
+       EmpathyContact              *contact;
+       GdkPixbuf                   *pixbuf_status;
 
        priv = GET_PRIV (store);
 
@@ -1589,11 +1798,75 @@ contact_list_store_update_list_mode_foreach (GtkTreeModel           *model,
                show_avatar = TRUE;
        }
 
+       gtk_tree_model_get (model, iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact,
+                           -1);
+
+       if (contact == NULL){
+               return FALSE;
+       }
+       /* get icon from hash_table */
+       pixbuf_status = contact_list_store_get_contact_status_icon (store, contact);
+
        gtk_tree_store_set (GTK_TREE_STORE (store), iter,
+                           EMPATHY_CONTACT_LIST_STORE_COL_ICON_STATUS, pixbuf_status,
                            EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar,
-                           EMPATHY_CONTACT_LIST_STORE_COL_STATUS_VISIBLE, !priv->is_compact,
+                           EMPATHY_CONTACT_LIST_STORE_COL_COMPACT, priv->is_compact,
                            -1);
 
        return FALSE;
 }
 
+static GdkPixbuf *
+contact_list_store_get_contact_status_icon_with_icon_name (
+                                       EmpathyContactListStore *store,
+                                       EmpathyContact *contact,
+                                       const gchar *status_icon_name)
+{
+       GdkPixbuf                   *pixbuf_status = NULL;
+       EmpathyContactListStorePriv *priv;
+       const gchar                 *protocol_name = NULL;
+       gchar                       *icon_name = NULL;
+
+       priv = GET_PRIV (store);
+
+       if (priv->show_protocols) {
+               protocol_name = empathy_protocol_name_for_contact (contact);
+               icon_name = g_strdup_printf ("%s-%s", status_icon_name, protocol_name);
+       } else {
+               icon_name = g_strdup_printf ("%s", status_icon_name);
+       }
+       pixbuf_status = g_hash_table_lookup (priv->status_icons, icon_name);
+       if (pixbuf_status == NULL) {
+               pixbuf_status = empathy_pixbuf_contact_status_icon_with_icon_name (contact,
+                                   status_icon_name,
+                                   priv->show_protocols);
+               if (pixbuf_status != NULL) {
+                       g_hash_table_insert (priv->status_icons,
+                           g_strdup (icon_name),
+                           pixbuf_status);
+               }
+       }
+
+       g_free (icon_name);
+       return pixbuf_status;
+}
+
+GdkPixbuf *
+contact_list_store_get_contact_status_icon (EmpathyContactListStore *store,
+                                           EmpathyContact *contact)
+{
+       GdkPixbuf                   *pixbuf_status = NULL;
+       const gchar                 *status_icon_name = NULL;
+
+       status_icon_name = empathy_icon_name_for_contact (contact);
+       if (status_icon_name == NULL)
+               return NULL;
+
+       pixbuf_status = contact_list_store_get_contact_status_icon_with_icon_name (
+                           store,
+                           contact,
+                           status_icon_name);
+
+       return pixbuf_status;
+}