# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1183045589 0
# Node ID 7f2c22c705a5d3ad276bb99c95285e9dc965e691
# Parent  b4f5a2c0f00a3c89c8bd56003d3b083340924c74
When the scrolled window is set to GTK_POLICY_NEVER, the scrolledwindow will increase its size request when there's enough text in the imhtml to warrent it. Turning the policy to AUTOMATIC makes the text wordwrap the way we want

diff -r b4f5a2c0f00a -r 7f2c22c705a5 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu Jun 28 14:53:47 2007 +0000
+++ b/pidgin/gtkconv.c	Thu Jun 28 15:46:29 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 b4f5a2c0f00a -r 7f2c22c705a5 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Thu Jun 28 14:53:47 2007 +0000
+++ b/pidgin/gtkutils.c	Thu Jun 28 15:46:29 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);