changeset
merge of '3f1c1518a7e1959d056c3aa0e815ec1b3c7a6845'
Tue, 18 Dec 2007 02:26:57 +0000
- author
- Evan Schoenberg <evands@pidgin.im>
- date
- Tue, 18 Dec 2007 02:26:57 +0000
- changeset 21968
- 0c7ec2fe53c5
- parent 21967
- 3f1c1518a7e1 (current diff)
- parent 21963
- bba34dfb2416 (diff)
- child 21969
- 9386fcc30b22
- child 21972
- e341941eded2
merge of '3f1c1518a7e1959d056c3aa0e815ec1b3c7a6845'
and 'bba34dfb2416a590858ddde303c92041ef5d6920'
--- 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));
