# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1191901127 0
# Node ID 83b662c458de47061d104c0c86b28d33661acc1b
# Parent  effa512ad24afe8e648c56da2b443a183dc42728
uses the entry's allocated height instead of requested height, works around
LP#150428

diff -r effa512ad24a -r 83b662c458de pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Oct 09 03:13:02 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Oct 09 03:38:47 2007 +0000
@@ -4371,7 +4371,7 @@
 	int wrapped_lines;
 	int lines;
 	GdkRectangle oneline;
-	GtkRequisition sr, entry_sr;
+	GtkRequisition sr;
 	int height, diff;
 	int pad_top, pad_inside, pad_bottom;
 
@@ -4399,8 +4399,7 @@
 	gtkconv->auto_resize = TRUE;
 	g_idle_add(reset_auto_resize_cb, gtkconv);
 
-	gtk_widget_size_request(gtkconv->entry, &entry_sr);
-	diff = height - entry_sr.height;
+	diff = height - gtkconv->entry->allocation.height;
 
 	if (diff > 0) {
 		gtk_widget_size_request(gtkconv->lower_hbox, &sr);