Mercurial > pidgin.yaz

changeset 13030:d09b19783b8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15383] Get rid of two compile warnings. Is this ugly? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 24 Jan 2006 04:48:49 +0000
parents a793170f588c
children 6728a282269b
files src/gtkblist.c
diffstat 1 files changed, 20 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkblist.c	Tue Jan 24 04:34:39 2006 +0000
+++ b/src/gtkblist.c	Tue Jan 24 04:48:49 2006 +0000
@@ -3518,25 +3518,29 @@
 		g_object_unref(pixbuf);
 		emblem = scale;
 		scale = NULL;
-	}
-
-	pixbuf = gaim_gtk_create_prpl_icon(account);
-	if (pixbuf != NULL) {
-		scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
+
+		pixbuf = gaim_gtk_create_prpl_icon(account);
+		if (pixbuf != NULL) {
+			scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16,
 		                                GDK_INTERP_BILINEAR);
-		gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.0, FALSE);
-		g_object_unref(G_OBJECT(pixbuf));
+			gdk_pixbuf_saturate_and_pixelate(scale, scale, 0.0, FALSE);
+			g_object_unref(G_OBJECT(pixbuf));
+
+			gdk_pixbuf_composite(emblem, scale, 6, 6, 10, 10, 6, 6, 1, 1,
+			                     GDK_INTERP_BILINEAR, 255);
+			g_object_unref(emblem);
+
+			emblem = scale;
+		}
+
+		image = gtk_image_new_from_pixbuf(emblem);
+		g_object_unref(emblem);
+
+		gtk_widget_show(image);
+		gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE,
+		                   GAIM_HIG_BOX_SPACE);
 	}
 
-	gdk_pixbuf_composite(emblem, scale, 6, 6, 10, 10, 6, 6, 1, 1,
-	                     GDK_INTERP_BILINEAR, 255);
-	g_object_unref(emblem);
-	image = gtk_image_new_from_pixbuf(scale);
-	g_object_unref(scale);
-	gtk_widget_show(image);
-	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE,
-	                   GAIM_HIG_BOX_SPACE);
-
 	label = gtk_label_new("");
 	gtk_label_set_markup(GTK_LABEL(label), text);
 	g_free(text);