# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1197424380 0
# Node ID a53f4b1813df8eed16be14c1858e287114669c83
# Parent  37f0b629137440dee118864ca2886d636a1228ec# Parent  1aba82112cf2ca00e124d7ff6e0e47ef2afc738b
merge of '74560aca587ea20e9eee77e340f6ba9fb7aca914'
     and 'fa0a15922c052e62854538389d21f7391d569a50'

diff -r 37f0b6291374 -r a53f4b1813df pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Dec 12 00:15:23 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Dec 12 01:53:00 2007 +0000
@@ -4349,7 +4349,7 @@
 	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;