# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1205718989 0
# Node ID 633eabc7eff4669738e9826e57d1e4864a2d5e98
# Parent  f54a1f4f2963d1b541afc9ad0df5fb2d7bc62dfa# Parent  82c4e6b589d0e26df290a3b28f4cda3b82b2c846
merge of 'c2f80865e78beb384f2dec792cac08ac44cf4eea'
     and 'ddb947301980e564af0ce937a3c94e5b6116304c'

diff -r f54a1f4f2963 -r 633eabc7eff4 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Mar 17 01:54:00 2008 +0000
+++ b/pidgin/gtkconv.c	Mon Mar 17 01:56:29 2008 +0000
@@ -4393,7 +4393,7 @@
 		height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
 	diff = height - gtkconv->entry->allocation.height;
-	if (diff == 0)
+	if (diff == 0 || (diff < 0 && -diff < oneline.height / 2))
 		return FALSE;
 
 	gtk_widget_size_request(gtkconv->lower_hbox, &sr);