Show protocol in compat mode too

There is no reason to not to (#607207).

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 08e6f59c152d7d76a0d9b743e0ead89b0eb86daa..53a0934b32f8501f9788a650788d5486fae42bea 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -1679,14 +1679,10 @@ contact_list_store_get_contact_status_icon_with_icon_name (
        EmpathyContactListStorePriv *priv;
        const gchar                 *protocol_name = NULL;
        gchar                       *icon_name = NULL;
-       gboolean                     show_protocol = FALSE;
 
        priv = GET_PRIV (store);
 
-       if (priv->show_protocols && !priv->is_compact) {
-               show_protocol = TRUE;
-       }
-       if (show_protocol) {
+       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 {
@@ -1696,7 +1692,7 @@ contact_list_store_get_contact_status_icon_with_icon_name (
        if (pixbuf_status == NULL) {
                pixbuf_status = empathy_pixbuf_contact_status_icon_with_icon_name (contact,
                                    status_icon_name,
-                                   show_protocol);
+                                   priv->show_protocols);
                if (pixbuf_status != NULL) {
                        g_hash_table_insert (priv->status_icons,
                            g_strdup (icon_name),

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index 82aa6b1d1c5b373c23f521471b037c8909689f6c..e9b1983d3533254f002066bca2d3461c25a3fd01 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -810,9 +810,6 @@ main_window_view_contacts_list_size_cb (GtkRadioAction    *action,
                                                     value == CONTACT_LIST_NORMAL_SIZE_WITH_AVATARS);
        empathy_contact_list_store_set_is_compact (window->list_store,
                                                   value == CONTACT_LIST_COMPACT_SIZE);
-
-       gtk_action_set_sensitive (GTK_ACTION (window->show_protocols),
-                                               value != CONTACT_LIST_COMPACT_SIZE );
 }
 
 static void main_window_notify_show_protocols_cb (EmpathyConf       *conf,