# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1197944710 0
# Node ID 54e1f0e024d28c5a828b0395e398ed004a01fef2
# Parent  944f7ada49e0cb3e4e0cc1740036bed9f36fea30# Parent  8a52e4cf64c5e14779bbafcfa7f80147fa93498e
merge of '2e5cda103238f64d27e4ed5aa92c149f6d50a5ec'
     and 'eba941c70407d0a6e17fa2204792caadadeda848'

diff -r 944f7ada49e0 -r 54e1f0e024d2 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Dec 17 20:37:30 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Dec 18 02:25:10 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));