# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170702385 0
# Node ID cea917eed4db63bd3babe6423064c186d96f0055
# Parent  ad9e09c331f587f7397411010391de4c6bc22129# Parent  042a9d405bf6c74d3951e084b92015c031dc00a2
merge of '71bbd0bd3449d503142a4a48f440f8e96b255feb'
     and '81f667be556e49e7524f70e320b235230fcaf725'

diff -r ad9e09c331f5 -r cea917eed4db pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Mon Feb 05 15:47:54 2007 +0000
+++ b/pidgin/gtkutils.c	Mon Feb 05 19:06:25 2007 +0000
@@ -152,7 +152,7 @@
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+								   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	gtk_widget_show(sw);