diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2008-11-19 20:53:56 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2008-11-19 20:53:56 +0100 |
| commit | 1dc33f57e2a47bab119a359f175b2bd5d107e63d (patch) | |
| tree | 0ec5f1bcc76b41684389eaf5fb5ce2537db4ed79 /src/gui/gui-bar-item.c | |
| parent | 33daa4bc55b1e1dcce45f921429d5c8cec75e2c4 (diff) | |
| download | weechat-1dc33f57e2a47bab119a359f175b2bd5d107e63d.zip | |
Remove old and unused color options
Diffstat (limited to 'src/gui/gui-bar-item.c')
| -rw-r--r-- | src/gui/gui-bar-item.c | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 904850b6d..def821c78 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -713,7 +713,7 @@ gui_bar_item_default_input_search (void *data, struct t_gui_bar_item *item, (window->buffer->text_search_found || !window->buffer->input_buffer || !window->buffer->input_buffer[0]) ? - gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_input))) : + GUI_COLOR_CUSTOM_BAR_FG : gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(config_color_input_text_not_found))), ptr_message); } @@ -1188,19 +1188,33 @@ gui_bar_item_default_buffer_nicklist (void *data, struct t_gui_bar_item *item, strcat (buf, " "); } } - config_file_search_with_string (ptr_nick->prefix_color, - NULL, NULL, &ptr_option, - NULL); - if (ptr_option) - strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(ptr_option)))); + if (strchr (ptr_nick->prefix_color, '.')) + { + config_file_search_with_string (ptr_nick->prefix_color, + NULL, NULL, &ptr_option, + NULL); + if (ptr_option) + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(ptr_option)))); + } + else + { + strcat (buf, gui_color_get_custom (ptr_nick->prefix_color)); + } str_prefix[0] = ptr_nick->prefix; str_prefix[1] = '\0'; strcat (buf, str_prefix); - config_file_search_with_string (ptr_nick->color, - NULL, NULL, &ptr_option, - NULL); - if (ptr_option) - strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(ptr_option)))); + if (strchr (ptr_nick->color, '.')) + { + config_file_search_with_string (ptr_nick->color, + NULL, NULL, &ptr_option, + NULL); + if (ptr_option) + strcat (buf, gui_color_get_custom (gui_color_get_name (CONFIG_COLOR(ptr_option)))); + } + else + { + strcat (buf, gui_color_get_custom (ptr_nick->color)); + } strcat (buf, ptr_nick->name); } else |