Mercurial > pidgin.yaz

changeset 20839:83b662c458de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uses the entry's allocated height instead of requested height, works around LP#150428
author Ka-Hing Cheung <khc@hxbc.us>
date Tue, 09 Oct 2007 03:38:47 +0000
parents effa512ad24a
children 30194e6e5e54 9da2ac85ce81
files pidgin/gtkconv.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);