# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1185164809 0
# Node ID 3700c41dd0db39e9b7e6c2ae56c92cb2c82d028b
# Parent  cec3ced34a7d1c205093ca84d980a4cae279455b# Parent  302ab7b3171d6289e5306298d39c49c35db32363
merge of '4d22d26e21a84d8f6fbb484b3b01e88eff143ca3'
     and 'c5667c23f0afbeaad2ec711f202f2f0b13c699dc'

diff -r cec3ced34a7d -r 3700c41dd0db pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Jul 23 03:03:20 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Jul 23 04:26:49 2007 +0000
@@ -8622,7 +8622,7 @@
 					   TRUE, GTK_PACK_START);
 
 	/* show the widgets */
-/* XXX	gtk_widget_show(gtkconv->icon); */
+	gtk_widget_show(gtkconv->icon);
 	gtk_widget_show(gtkconv->tab_label);
 	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
 		gtk_widget_show(gtkconv->close);