diff pidgin/gtkblist.c @ 25194:5ba9484fe17e

propagate from branch 'im.pidgin.pidgin' (head e602a35f60e3d423d43bacc72fcb7239c8b43cf0) to branch 'im.pidgin.cpw.malu.xmpp.attention' (head bbf3425564aac1c00284baad3f561adb5da2752d)

--- a/pidgin/gtkblist.c	Wed Jan 07 22:05:01 2009 +0000
+++ b/pidgin/gtkblist.c	Tue Jan 13 18:38:15 2009 +0000
@@ -3648,9 +3648,8 @@
 		}
 
 		if (((struct _pidgin_blist_node*)(node->parent->ui_data))->contact_expanded) {
-			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
-				return NULL;
-			return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
+			if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons"))
+				return pidgin_create_prpl_icon(((PurpleBuddy*)node)->account, PIDGIN_PRPL_ICON_SMALL);
 		}
 	} else {
 		return NULL;
@@ -5386,14 +5385,7 @@
 			  NULL);
 	gtk_widget_set_name(gtkblist->headline_hbox, "gtk-tooltips");
 
-	gtkblist->headline_close = gtk_widget_render_icon(ebox, GTK_STOCK_CLOSE, -1, NULL);
-	if (gtkblist->headline_close) {
-		GdkPixbuf *scale = gdk_pixbuf_scale_simple(gtkblist->headline_close,
-				HEADLINE_CLOSE_SIZE, HEADLINE_CLOSE_SIZE, GDK_INTERP_BILINEAR);
-		gdk_pixbuf_unref(gtkblist->headline_close);
-		gtkblist->headline_close = scale;
-	}
-
+	gtkblist->headline_close = gtk_widget_render_icon(ebox, GTK_STOCK_CLOSE, HEADLINE_CLOSE_SIZE, NULL);
 	gtkblist->hand_cursor = gdk_cursor_new (GDK_HAND2);
 	gtkblist->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);