diff options
Diffstat (limited to 'src/gui/gui-color.c')
| -rw-r--r-- | src/gui/gui-color.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/gui/gui-color.c b/src/gui/gui-color.c index 470bc7a97..7ffd619a5 100644 --- a/src/gui/gui-color.c +++ b/src/gui/gui-color.c @@ -1,7 +1,7 @@ /* * gui-color.c - color functions (used by all GUI) * - * Copyright (C) 2003-2015 Sébastien Helleu <flashcode@flashtux.org> + * Copyright (C) 2003-2016 Sébastien Helleu <flashcode@flashtux.org> * * This file is part of WeeChat, the extensible chat client. * @@ -760,11 +760,10 @@ gui_color_decode (const char *string, const char *replacement) char * gui_color_decode_ansi_cb (void *data, const char *text) { - unsigned long keep_colors; char *text2, **items, *output, str_color[128]; - int i, length, num_items, value; + int i, keep_colors, length, num_items, value; - keep_colors = (unsigned long)data; + keep_colors = (data) ? 1 : 0;; /* if we don't keep colors of if text is empty, just return empty string */ if (!keep_colors || !text || !text[0]) @@ -1186,20 +1185,20 @@ gui_color_palette_alloc_structs () { if (!gui_color_hash_palette_color) { - gui_color_hash_palette_color = hashtable_new (32, - WEECHAT_HASHTABLE_STRING, - WEECHAT_HASHTABLE_POINTER, - NULL, - NULL); + gui_color_hash_palette_color = hashtable_new ( + 32, + WEECHAT_HASHTABLE_STRING, + WEECHAT_HASHTABLE_POINTER, + NULL, NULL); gui_color_hash_palette_color->callback_free_value = &gui_color_palette_free_value_cb; } if (!gui_color_hash_palette_alias) { - gui_color_hash_palette_alias = hashtable_new (32, - WEECHAT_HASHTABLE_STRING, - WEECHAT_HASHTABLE_INTEGER, - NULL, - NULL); + gui_color_hash_palette_alias = hashtable_new ( + 32, + WEECHAT_HASHTABLE_STRING, + WEECHAT_HASHTABLE_INTEGER, + NULL, NULL); } if (!gui_color_list_with_alias) { |