diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-11 16:33:57 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-03-11 16:33:57 +0800 |
| commit | a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c (patch) | |
| tree | 747369da40a23e3651d53452626b1364de26be19 /libempathy-gtk | |
| parent | 8b5c358f07d906d4b9911bdf03f37cc25bdade80 (diff) | |
| download | gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar.gz gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar.bz2 gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar.lz gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar.xz gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.tar.zst gsoc2013-empathy-a0b17d8b76f2d9c0bfd25470a7ded2efa98e217c.zip | |
Never show avatars in compact mode. Fixes #475789 (Marco Barisione).
svn path=/trunk/; revision=734
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 6 |
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, |