pidgin: fd127d13: Do not let the height of the entry get l...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: fd127d13225846192ca2138f6d1c2663165dc74b
Ancestor: 4afd9b8ce2a9c91ba21b92d2b86284bfee1a38e6
Author: sadrul at pidgin.im
Date: 2008-05-05T00:00:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fd127d13225846192ca2138f6d1c2663165dc74b

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Do not let the height of the entry get larger than half the conversation
window, irrespective of the preferred minimum height.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	547a089c6576a73b28458c15851a94c4defa7135
+++ pidgin/gtkconv.c	8ca7a4c2bc3215d8ad67faf22d70046de4eb78b8
@@ -4486,7 +4486,7 @@ static gboolean resize_imhtml_cb(PidginC
 	 * prevent scrolling when the second line is a continuation of the first line, or
 	 * is the beginning of a new paragraph. */
 	min_height = min_lines * (oneline.height + MAX(pad_inside, pad_top + pad_bottom));
-	height = CLAMP(height, min_height, max_height);
+	height = CLAMP(height, MIN(min_height, max_height), max_height);
 
 	diff = height - gtkconv->entry->allocation.height;
 	if (ABS(diff) < oneline.height / 2)