Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 21765:8922d61c738a | 21766:8c1bcaaaac34 |
|---|---|
| 4347 | 4347 |
| 4348 pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); | 4348 pad_top = gtk_text_view_get_pixels_above_lines(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4349 pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); | 4349 pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4350 pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); | 4350 pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry)); |
| 4351 | 4351 |
| 4352 height = (oneline.height + pad_top + pad_bottom) * lines; | 4352 height = (oneline.height + pad_top + pad_bottom) * (lines + 1); |
| 4353 height += (oneline.height + pad_inside) * (wrapped_lines - lines); | 4353 height += (oneline.height + pad_inside) * (wrapped_lines - lines); |
| 4354 | 4354 |
| 4355 gtkconv->auto_resize = TRUE; | 4355 gtkconv->auto_resize = TRUE; |
| 4356 g_idle_add(reset_auto_resize_cb, gtkconv); | 4356 g_idle_add(reset_auto_resize_cb, gtkconv); |
| 4357 | 4357 |
| 7818 const char *labelname; | 7818 const char *labelname; |
| 7819 const char *color; | 7819 const char *color; |
| 7820 } styles[] = { | 7820 } styles[] = { |
| 7821 {"pidgin_tab_label_typing_default", "tab-label-typing", "#4e9a06"}, | 7821 {"pidgin_tab_label_typing_default", "tab-label-typing", "#4e9a06"}, |
| 7822 {"pidgin_tab_label_typed_default", "tab-label-typed", "#c4a000"}, | 7822 {"pidgin_tab_label_typed_default", "tab-label-typed", "#c4a000"}, |
| 7823 {"pidgin_tab_label_attention_default", "tab-label-attention", "#204a87"}, | 7823 {"pidgin_tab_label_attention_default", "tab-label-attention", "#006aff"}, |
| 7824 {"pidgin_tab_label_unreadchat_default", "tab-label-unreadchat", "#cc0000"}, | 7824 {"pidgin_tab_label_unreadchat_default", "tab-label-unreadchat", "#cc0000"}, |
| 7825 {"pidgin_tab_label_event_default", "tab-label-event", "#888a85"}, | 7825 {"pidgin_tab_label_event_default", "tab-label-event", "#888a85"}, |
| 7826 {NULL, NULL, NULL} | 7826 {NULL, NULL, NULL} |
| 7827 }; | 7827 }; |
| 7828 int iter; | 7828 int iter; |