pidgin: 8f0b34c5: Use the correct name for a preference. T...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 8f0b34c54e38066959f87d35b0af2ca6ae0e853b
Ancestor: 3578e7f4bb0e7d1716dab8b0d111eba4b2130536
Author: sadrul at pidgin.im
Date: 2008-04-26T12:04:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8f0b34c54e38066959f87d35b0af2ca6ae0e853b

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Use the correct name for a preference. This will correctly update the
protocol icon in the infopane when the setting is changed.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	dd6c594947f87186204f853247544eba7911a328
+++ pidgin/gtkconv.c	951c63c29cd65b0386d5fa5d10117e0b8f927afb
@@ -2507,14 +2507,18 @@ update_tab_icon(PurpleConversation *conv
 
 	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 @@ pidgin_conversations_init(void)
 								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);