im.pidgin.pidgin: fa0a15922c052e62854538389d21f7391d569a50

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: fa0a15922c052e62854538389d21f7391d569a50
Ancestor: 84972790bfef34a3944ec57b604e56d2b21bfa84
Author: nosnilmot at pidgin.im
Date: 2007-12-12T01:48:49
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Let's try MAX(lines, 2) as suggested by Sean. I've been using (lines + 1)
for a while now and would probably tolerate it as a replacement for manual
resizing, but I might be able to adjust to this too. We'll see.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	601d6fcf11491b28ce0382a9ce3a6f57a875f03d
+++ pidgin/gtkconv.c	da269a7ff321fb84f0a965c5f11d00f2d8731d7e
@@ -4349,7 +4349,7 @@ static gboolean resize_imhtml_cb(PidginC
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));
 
-	height = (oneline.height + pad_top + pad_bottom) * (lines + 1);
+	height = (oneline.height + pad_top + pad_bottom) * MAX(lines, 2);
 	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
 	gtkconv->auto_resize = TRUE;