Mercurial > pidgin
diff pidgin/gtkconv.c @ 21766:8c1bcaaaac34
merge of '6cc61e144190cb90c18c63d45b7d7abd95a67008'
and '7adb724fcfb08212b94d02541fea98c6b1a20658'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 04 Dec 2007 09:32:22 +0000 |
| parents | 8922d61c738a 866e139a79ef |
| children | 21371ea85970 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Tue Dec 04 09:30:25 2007 +0000 +++ b/pidgin/gtkconv.c Tue Dec 04 09:32:22 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; @@ -7820,7 +7820,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}