# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1188866344 0
# Node ID f0aef60819af342b4733c651d1998db26616a2a0
# Parent  793973fedd023ffe889ee466030746f42f95eb5d# Parent  ac9daf303942b2c4e04923c2e70b15b8f708e552
merge of '0372d7dd82f502ec3e68166bf2b289e71267897a'
     and '9668e3bf374a479da960a1666b880b30f104214b'

diff -r 793973fedd02 -r f0aef60819af pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c	Mon Sep 03 23:22:54 2007 +0000
+++ b/pidgin/gtkpounce.c	Tue Sep 04 00:39:04 2007 +0000
@@ -975,7 +975,7 @@
 			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/play-sound"));
 	}
 
-	gtk_widget_show_all(vbox2);
+	gtk_widget_show(vbox2);
 	gtk_widget_show(window);
 }
 
diff -r 793973fedd02 -r f0aef60819af pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Sep 03 23:22:54 2007 +0000
+++ b/pidgin/gtkprefs.c	Tue Sep 04 00:39:04 2007 +0000
@@ -1036,12 +1036,14 @@
 		gtk_widget_set_sensitive(hbox, FALSE);
 	g_signal_connect(G_OBJECT(fontpref), "clicked", G_CALLBACK(pidgin_toggle_sensitive), hbox);
 	g_signal_connect(G_OBJECT(font_button), "font-set", G_CALLBACK(pidgin_custom_font_set), NULL);
+	gtk_widget_show_all(hbox);
 #endif
 
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
 	gtk_box_set_child_packing(GTK_BOX(vbox->parent), vbox, TRUE, TRUE, 0, GTK_PACK_START);
 
 	frame = pidgin_create_imhtml(TRUE, &imhtml, &toolbar, NULL);
+	gtk_widget_show(frame);
 	gtk_widget_set_name(imhtml, "pidgin_prefs_font_imhtml");
 	gtk_widget_set_size_request(frame, 300, -1);
 	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
@@ -1068,7 +1070,7 @@
 					 G_CALLBACK(formatting_clear_cb), NULL);
 
 
-	gtk_widget_show_all(ret);
+	gtk_widget_show(ret);
 
 	return ret;
 }