changeset
merge of '8e9d4dfd09da21ab5fb423a5386eb1604441515d'
Wed, 12 Dec 2007 01:53:00 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Wed, 12 Dec 2007 01:53:00 +0000
- changeset 21938
- 615d1409985d
- parent 21937
- 8e9d4dfd09da (current diff)
- parent 21933
- 8915f0c00c52 (diff)
- child 21939
- 8d8200de2ade
merge of '8e9d4dfd09da21ab5fb423a5386eb1604441515d'
and '8915f0c00c5287fd4aca2a0e3815e4a35e3f78e3'
| pidgin/gtkconv.c | file | annotate | diff | comparison | revisions |
--- 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;
