# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1209691774 0
# Node ID 08bb9d490f3802bed0f87df1483853ec40cbb067
# Parent  6079335eb01c0349576896a184736623eb9730e0# Parent  fdf60a5c2f66601c4ad1c42a9e915cb1e0be36aa
merge of 'e238fa4987184e7ce5509bc8806f7122ad41ae6e'
     and 'e7903adb01a354969499931bea5fa76b55ade1ae'

diff -r fdf60a5c2f66 -r 08bb9d490f38 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri May 02 00:30:14 2008 +0000
+++ b/pidgin/gtkconv.c	Fri May 02 01:29:34 2008 +0000
@@ -4458,7 +4458,7 @@
 	GdkRectangle oneline;
 	int height, diff;
 	int pad_top, pad_inside, pad_bottom;
-	int max_height = gtkconv->tab_cont->allocation.height / 2;
+	int max_height = (gtkconv->imhtml->allocation.height + gtkconv->entry->allocation.height) / 2;
 
 	pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));