Mercurial > pidgin
changeset 21855:214da49fdcd4
merge of '3cec6952fcadbd73dddc4c009e798b6fb1789a5b'
and 'eba941c70407d0a6e17fa2204792caadadeda848'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Tue, 18 Dec 2007 02:26:57 +0000 |
| parents | cb715de60eb2 (current diff) 8a52e4cf64c5 (diff) |
| children | 2e899bbbf14c c117352a6088 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Mon Dec 17 23:22:30 2007 +0000 +++ b/pidgin/gtkconv.c Tue Dec 18 02:26:57 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));