changeset
merge of 'fded473be12a0119e68c6287767451e790e3b1d7'
Tue, 18 Dec 2007 02:25:10 +0000
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Tue, 18 Dec 2007 02:25:10 +0000
- changeset 21970
- 510592f58799
- parent 21965
- fded473be12a (current diff)
- parent 21963
- bba34dfb2416 (diff)
- child 21971
- e00e0d55d129
merge of 'fded473be12a0119e68c6287767451e790e3b1d7'
and 'bba34dfb2416a590858ddde303c92041ef5d6920'
--- 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));
