Mercurial > pidgin
changeset 21851:54e1f0e024d2
merge of '2e5cda103238f64d27e4ed5aa92c149f6d50a5ec'
and 'eba941c70407d0a6e17fa2204792caadadeda848'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 18 Dec 2007 02:25:10 +0000 |
| parents | 944f7ada49e0 (current diff) 8a52e4cf64c5 (diff) |
| children | c8e37362179a |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Dec 17 20:37:30 2007 +0000 +++ b/pidgin/gtkconv.c Tue Dec 18 02:25:10 2007 +0000 @@ -4342,8 +4342,8 @@ lines = gtk_text_buffer_get_line_count(buffer); - /* Show a maximum of 4 lines, minimum of 2 */ - lines = MIN(MAX(lines, 2), 4); + /* Show a maximum of 4 lines */ + lines = MIN(lines, 4); wrapped_lines = MIN(MAX(wrapped_lines, 2), 4); pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry));