im.pidgin.pidgin: 83245b7ca93e546927c19472b74cf4dff6d1a96b

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 83245b7ca93e546927c19472b74cf4dff6d1a96b
Ancestor: 8f01978e548005303588d73de8202f9434b8e3db
Author: khc at pidgin.im
Date: 2007-10-09T03:38:47
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

uses the entry's allocated height instead of requested height, works around
LP#150428


-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	b371ab366a67883557cc1a095d6c2628f840398d
+++ pidgin/gtkconv.c	a209de287475b4c578ffbdacf600110b1cee714c
@@ -4371,7 +4371,7 @@ static void resize_imhtml_cb(PidginConve
 	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 @@ static void resize_imhtml_cb(PidginConve
 	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);