aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-03-11 16:33:57 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-03-11 16:33:57 +0800
commit16216c574d0d38d2a9eeb8a50f677e9358b290df (patch)
tree747369da40a23e3651d53452626b1364de26be19 /libempathy-gtk
parentec35bea94aa4d5323bbbddfa7d2f8fe0923b7c3e (diff)
downloadgsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar.gz
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar.bz2
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar.lz
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar.xz
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.tar.zst
gsoc2013-empathy-16216c574d0d38d2a9eeb8a50f677e9358b290df.zip
Never show avatars in compact mode. Fixes #475789 (Marco Barisione).
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@734 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index cf43bce62..46fa99474 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -976,6 +976,7 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
gboolean do_remove = FALSE;
gboolean do_set_active = FALSE;
gboolean do_set_refresh = FALSE;
+ gboolean show_avatar = FALSE;
GdkPixbuf *pixbuf_avatar;
priv = GET_PRIV (store);
@@ -1070,12 +1071,15 @@ contact_list_store_contact_update (EmpathyContactListStore *store,
set_model = TRUE;
}
+ if (priv->show_avatars && !priv->is_compact) {
+ show_avatar = TRUE;
+ }
pixbuf_avatar = empathy_pixbuf_avatar_from_contact_scaled (contact, 32, 32);
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_PIXBUF_AVATAR, pixbuf_avatar,
- EMPATHY_CONTACT_LIST_STORE_COL_PIXBUF_AVATAR_VISIBLE, priv->show_avatars,
+ 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,