empathy r639 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Sat Feb 16 09:22:44 2008
New Revision: 639
URL: http://svn.gnome.org/viewvc/empathy?rev=639&view=rev

Log:
Create avatar pixbuf only if the theme shows avatars


Modified:
   trunk/libempathy-gtk/empathy-theme-boxes.c

Modified: trunk/libempathy-gtk/empathy-theme-boxes.c
==============================================================================
--- trunk/libempathy-gtk/empathy-theme-boxes.c	(original)
+++ trunk/libempathy-gtk/empathy-theme-boxes.c	Sat Feb 16 09:22:44 2008
@@ -597,15 +597,16 @@
 	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",