# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1205738459 0
# Node ID 4d8e1c17b3f9e1c9fe391f1faa4399130a8d60a3
# Parent  f8b47fd39f530e0c4e6ba391052ca3061df39f75
"-diff < oneline.height / 2" broke fixed height of entry field

diff -r f8b47fd39f53 -r 4d8e1c17b3f9 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Mar 17 07:07:05 2008 +0000
+++ b/pidgin/gtkconv.c	Mon Mar 17 07:20:59 2008 +0000
@@ -4467,8 +4467,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))
+	if (diff <= 0)
 		return FALSE;
 
 	gtk_widget_size_request(gtkconv->lower_hbox, &sr);