changeset 22743:71e88e6a6608

merge of '8f0b34c54e38066959f87d35b0af2ca6ae0e853b' and 'dde5e18826606b5b71cef9ec3c4d490ebdc3c22f'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 26 Apr 2008 12:14:22 +0000
parents fe546f9e3cbf (diff) de58bebea31a (current diff)
children 7c801c16bacc
files
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Sat Apr 26 10:37:36 2008 +0000
+++ b/pidgin/gtkconv.c	Sat Apr 26 12:14:22 2008 +0000
@@ -2507,14 +2507,18 @@
 
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_protocol_icons")) {
 		emblem = pidgin_create_prpl_icon(gtkconv->active_conv->account, PIDGIN_PRPL_ICON_SMALL);
-		gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
+	} else {
+		emblem = NULL;
+	}
+
+	gtk_list_store_set(GTK_LIST_STORE(gtkconv->infopane_model),
 			&(gtkconv->infopane_iter),
 			CONV_PROTOCOL_ICON_COLUMN, emblem, -1);
-		if (emblem)
-			g_object_unref(emblem);
-	}
+	if (emblem)
+		g_object_unref(emblem);
 
 	/* XXX seanegan Why do I have to do this? */
+	gtk_widget_queue_resize(gtkconv->infopane);
 	gtk_widget_queue_draw(gtkconv->infopane);
 
 	if (status != NULL)
@@ -7723,7 +7727,7 @@
 								animate_buddy_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons",
 								show_buddy_icons_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/show_protocol_icons",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_protocol_icons",
 								show_protocol_icons_pref_cb, NULL);
 	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
                                 hide_new_pref_cb, NULL);