diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-18 20:35:36 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-01-26 00:04:20 +0800 |
| commit | e3496e8e45bc201a55f64c000933ca30df86e43a (patch) | |
| tree | f8a1b2f6af2e6c8860c94746f0ba423e353f9756 | |
| parent | 99ff3fc5e1115987daffeb3ba3ea75bace884247 (diff) | |
| download | gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar.gz gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar.bz2 gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar.lz gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar.xz gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.tar.zst gsoc2013-empathy-e3496e8e45bc201a55f64c000933ca30df86e43a.zip | |
Show protocol in compat mode too
There is no reason to not to (#607207).
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 8 | ||||
| -rw-r--r-- | src/empathy-main-window.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 08e6f59c1..53a0934b3 100644 --- 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 82aa6b1d1..e9b1983d3 100644 --- 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, |