aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-02-16 17:22:44 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-02-16 17:22:44 +0800
commit3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa (patch)
treed0d89abc94957e0ff03cd3a8acea4685a3d72316
parenta17ae72f50370e70a8f231b4d24361d448402b20 (diff)
downloadgsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar.gz
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar.bz2
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar.lz
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar.xz
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.tar.zst
gsoc2013-empathy-3dd80ee44fcece8eb9860f48e4ed23e3c92e27aa.zip
Create avatar pixbuf only if the theme shows avatars
svn path=/trunk/; revision=639
-rw-r--r--libempathy-gtk/empathy-theme-boxes.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 30ae59f30..7285a9e9e 100644
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -597,15 +597,16 @@ theme_boxes_maybe_append_header (EmpathyTheme *theme,
box = gtk_hbox_new (FALSE, 0);
- avatar = empathy_chat_view_get_avatar_pixbuf_with_cache (contact);
- if (avatar && empathy_theme_get_show_avatars (theme)) {
- GtkWidget *image;
+ if (empathy_theme_get_show_avatars (theme)) {
+ avatar = empathy_chat_view_get_avatar_pixbuf_with_cache (contact);
+ if (avatar) {
+ GtkWidget *image;
- image = gtk_image_new_from_pixbuf (avatar);
-
- gtk_box_pack_start (GTK_BOX (box), image,
- FALSE, TRUE, 2);
+ image = gtk_image_new_from_pixbuf (avatar);
+ gtk_box_pack_start (GTK_BOX (box), image,
+ FALSE, TRUE, 2);
+ }
}
g_signal_connect_object (view, "size-allocate",