Mercurial > pidgin
changeset 22809:08bb9d490f38
merge of 'e238fa4987184e7ce5509bc8806f7122ad41ae6e'
and 'e7903adb01a354969499931bea5fa76b55ade1ae'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 02 May 2008 01:29:34 +0000 |
| parents | 6079335eb01c (diff) fdf60a5c2f66 (current diff) |
| children | 95308e1b47d1 7883ed211f3e |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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));