# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1191937271 0
# Node ID a2b2fc59b57178c7e2971388df65cfdf1acc43bc
# Parent  58b9a33968e10fe14078adff8d48eb258ccad7f4# Parent  9da2ac85ce813bd690eb63a663f6681acda801f6
merge of '067c06f2c33e5371796629696a9aad6afa4e9ead'
     and 'e7a18c70a00a0534e1e6f7956970e10d6d0b69ec'

diff -r 58b9a33968e1 -r a2b2fc59b571 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Oct 09 07:31:09 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Oct 09 13:41:11 2007 +0000
@@ -4363,7 +4363,6 @@
 	gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, 1);
 }
 
-
 static void resize_imhtml_cb(PidginConversation *gtkconv)
 {
 	GtkTextBuffer *buffer;
@@ -4404,7 +4403,14 @@
 	if (diff > 0) {
 		gtk_widget_size_request(gtkconv->lower_hbox, &sr);
 		gtkconv->entry_growing = TRUE;
-		gtk_widget_set_size_request(gtkconv->lower_hbox, -1, diff + sr.height);
+
+		/* uncomment this to auto resize even after the user manually
+		   resizes
+		gtk_paned_set_position(GTK_PANED(gtkconv->lower_hbox->parent->parent),
+			-1);
+		*/
+		gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
+			diff + gtkconv->lower_hbox->allocation.height);
 	}
 }