# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1197944817 0
# Node ID 214da49fdcd4748602c808658837e0e36eae635c
# Parent  cb715de60eb2679811b78dab7d58922880c4ef41# Parent  8a52e4cf64c5e14779bbafcfa7f80147fa93498e
merge of '3cec6952fcadbd73dddc4c009e798b6fb1789a5b'
     and 'eba941c70407d0a6e17fa2204792caadadeda848'

diff -r cb715de60eb2 -r 214da49fdcd4 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Dec 17 23:22:30 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Dec 18 02:26:57 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));