Mercurial > pidgin
changeset 21823:a53f4b1813df
merge of '74560aca587ea20e9eee77e340f6ba9fb7aca914'
and 'fa0a15922c052e62854538389d21f7391d569a50'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 12 Dec 2007 01:53:00 +0000 |
| parents | 37f0b6291374 (current diff) 1aba82112cf2 (diff) |
| children | 189abce087ab |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Dec 12 00:15:23 2007 +0000 +++ b/pidgin/gtkconv.c Wed Dec 12 01:53:00 2007 +0000 @@ -4349,7 +4349,7 @@ pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); - height = (oneline.height + pad_top + pad_bottom) * (lines + 1); + height = (oneline.height + pad_top + pad_bottom) * MAX(lines, 2); height += (oneline.height + pad_inside) * (wrapped_lines - lines); gtkconv->auto_resize = TRUE;