# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1183151837 0
# Node ID 1cd1e00e059c78f0f7360a1edc4a5ee05dad00ba
# Parent  700b642631bc9b6843eced242e486eedc803dd9a# Parent  7f2c22c705a5d3ad276bb99c95285e9dc965e691
merge of '89468df5d1cdb033902c9f7e41cfdf3a348d97bc'
     and '9ca69582ec713e756d2febc1267a8192298994b3'

diff -r 700b642631bc -r 1cd1e00e059c pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Jun 29 19:36:31 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Jun 29 21:17:17 2007 +0000
@@ -2406,9 +2406,6 @@
 		return FALSE;
 	}
 
-	gtkconv->auto_resize = TRUE;
-	g_idle_add(reset_auto_resize_cb, gtkconv);
-
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 	buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
 
@@ -4256,7 +4253,7 @@
 	if (sr.height < height + PIDGIN_HIG_BOX_SPACE) {
 		gtkconv->auto_resize = TRUE;
 		gtkconv->entry_growing = TRUE;
-	        gtk_widget_set_size_request(gtkconv->lower_hbox, -1, height + PIDGIN_HIG_BOX_SPACE);
+	        gtk_widget_set_size_request(gtkconv->entry, -1, height);
 	        g_idle_add(reset_auto_resize_cb, gtkconv);
 	}
 }
diff -r 700b642631bc -r 1cd1e00e059c pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Fri Jun 29 19:36:31 2007 +0000
+++ b/pidgin/gtkutils.c	Fri Jun 29 21:17:17 2007 +0000
@@ -176,7 +176,7 @@
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-								   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+								   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	gtk_widget_show(sw);