changeset
merge of '3fe10e03d4f0d97edb29c18842ff10adbc9786e4'
Tue, 04 Dec 2007 02:50:44 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Tue, 04 Dec 2007 02:50:44 +0000
- changeset 21872
- fed885de0ffc
- parent 21868
- 3fe10e03d4f0 (current diff)
- parent 21871
- b3483f65cedd (diff)
- child 21873
- c4069a97a883
- child 21875
- d21cfed2af93
merge of '3fe10e03d4f0d97edb29c18842ff10adbc9786e4'
and 'b3483f65cedde87143933e4f960e1ed71e9d5cf2'
--- a/pidgin/gtkconv.c Mon Dec 03 22:57:49 2007 +0000 +++ b/pidgin/gtkconv.c Tue Dec 04 02:50:44 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; + height = (oneline.height + pad_top + pad_bottom) * (lines + 1); height += (oneline.height + pad_inside) * (wrapped_lines - lines); gtkconv->auto_resize = TRUE; @@ -7817,7 +7817,7 @@ } styles[] = { {"pidgin_tab_label_typing_default", "tab-label-typing", "#4e9a06"}, {"pidgin_tab_label_typed_default", "tab-label-typed", "#c4a000"}, - {"pidgin_tab_label_attention_default", "tab-label-attention", "#204a87"}, + {"pidgin_tab_label_attention_default", "tab-label-attention", "#006aff"}, {"pidgin_tab_label_unreadchat_default", "tab-label-unreadchat", "#cc0000"}, {"pidgin_tab_label_event_default", "tab-label-event", "#888a85"}, {NULL, NULL, NULL}
