diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2019-03-10 13:16:59 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2019-03-10 18:29:16 +0100 |
| commit | 2b70d71aa1c891f2f251aa775cf239e5611576d5 (patch) | |
| tree | 33b7daaa910582482c420e4e1e06a2d8851572e9 /src/gui/curses | |
| parent | 8aa5f5375e2a16d538fdf96babcd52a2f8f7801c (diff) | |
| download | weechat-2b70d71aa1c891f2f251aa775cf239e5611576d5.zip | |
core: replace argument "keep_eol" by "flags" in function string_split (closes #1322)
Diffstat (limited to 'src/gui/curses')
| -rw-r--r-- | src/gui/curses/gui-curses-bar-window.c | 7 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-color.c | 13 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/gui/curses/gui-curses-bar-window.c b/src/gui/curses/gui-curses-bar-window.c index f592a51cd..8df7b6019 100644 --- a/src/gui/curses/gui-curses-bar-window.c +++ b/src/gui/curses/gui-curses-bar-window.c @@ -32,6 +32,7 @@ #include "../../core/wee-log.h" #include "../../core/wee-string.h" #include "../../core/wee-utf8.h" +#include "../../plugins/plugin.h" #include "../gui-bar.h" #include "../gui-bar-item.h" #include "../gui-bar-window.h" @@ -486,7 +487,11 @@ gui_bar_window_draw (struct t_gui_bar_window *bar_window, } } - items = string_split (content, "\n", 0, 0, &items_count); + items = string_split (content, "\n", + WEECHAT_STRING_SPLIT_STRIP_LEFT + | WEECHAT_STRING_SPLIT_STRIP_RIGHT + | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS, + 0, &items_count); if (items_count == 0) { if (CONFIG_INTEGER(bar_window->bar->options[GUI_BAR_OPTION_SIZE]) == 0) diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c index 068d2a01c..992f1ba5c 100644 --- a/src/gui/curses/gui-curses-color.c +++ b/src/gui/curses/gui-curses-color.c @@ -935,7 +935,12 @@ gui_color_buffer_display () gui_chat_printf_y (gui_color_buffer, y++, _("Nick colors:")); items = string_split (CONFIG_STRING(config_color_chat_nick_colors), - ",", 0, 0, &num_items); + ",", + WEECHAT_STRING_SPLIT_STRIP_LEFT + | WEECHAT_STRING_SPLIT_STRIP_RIGHT + | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS, + 0, + &num_items); if (items) { str_line[0] = '\0'; @@ -1340,7 +1345,11 @@ gui_color_palette_new (int number, const char *value) str_alias = NULL; str_rgb = NULL; - items = string_split (value, ";", 0, 0, &num_items); + items = string_split (value, ";", + WEECHAT_STRING_SPLIT_STRIP_LEFT + | WEECHAT_STRING_SPLIT_STRIP_RIGHT + | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS, + 0, &num_items); if (items) { for (i = 0; i < num_items; i++) |