# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1197939599 0
# Node ID 8a52e4cf64c5e14779bbafcfa7f80147fa93498e
# Parent  378eb189349961bfdcd5c3d7de63325ae1680135
I noticed that the new added padding in gtkconv has the same effect as an extra line of text, so I'm removing the MAX(2 bit

diff -r 378eb1893499 -r 8a52e4cf64c5 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Dec 17 12:10:55 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Dec 18 00:59:59 2007 +0000
@@ -4342,8 +4342,8 @@
 
 	lines = gtk_text_buffer_get_line_count(buffer);
 
-	/* Show a maximum of 4 lines, minimum of 2 */
-	lines = MIN(MAX(lines, 2), 4);
+	/* Show a maximum of 4 lines */
+	lines = MIN(lines, 4);
 	wrapped_lines = MIN(MAX(wrapped_lines, 2), 4);
 
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));