changeset 22491:633eabc7eff4

merge of 'c2f80865e78beb384f2dec792cac08ac44cf4eea' and 'ddb947301980e564af0ce937a3c94e5b6116304c'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 17 Mar 2008 01:56:29 +0000
parents f54a1f4f2963 (current diff) 82c4e6b589d0 (diff)
children 0c2dd59f91d1
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);