diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/wee-config.c | 6 | ||||
| -rw-r--r-- | src/core/wee-config.h | 1 | ||||
| -rw-r--r-- | src/gui/gui-bar-item.c | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/core/wee-config.c b/src/core/wee-config.c index d1c4d3e12..e853fada5 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -80,6 +80,7 @@ struct t_config_option *config_look_highlight; struct t_config_option *config_look_hotlist_names_count; struct t_config_option *config_look_hotlist_names_length; struct t_config_option *config_look_hotlist_names_level; +struct t_config_option *config_look_hotlist_names_merged_buffers; struct t_config_option *config_look_hotlist_short_names; struct t_config_option *config_look_hotlist_sort; struct t_config_option *config_look_item_time_format; @@ -1281,6 +1282,11 @@ config_weechat_init_options () "of: 1=join/part, 2=message, 4=private, 8=highlight, " "for example: 12=private+highlight)"), NULL, 1, 15, "12", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); + config_look_hotlist_names_merged_buffers = config_file_new_option ( + weechat_config_file, ptr_section, + "hotlist_names_merged_buffers", "boolean", + N_("if set, force display of names in hotlist for merged buffers"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_buffer_content, NULL, NULL, NULL); config_look_hotlist_short_names = config_file_new_option ( weechat_config_file, ptr_section, "hotlist_short_names", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index 12b359204..d6bbb85be 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -95,6 +95,7 @@ extern struct t_config_option *config_look_highlight; extern struct t_config_option *config_look_hotlist_names_count; extern struct t_config_option *config_look_hotlist_names_length; extern struct t_config_option *config_look_hotlist_names_level; +extern struct t_config_option *config_look_hotlist_names_merged_buffers; extern struct t_config_option *config_look_hotlist_short_names; extern struct t_config_option *config_look_hotlist_sort; extern struct t_config_option *config_look_item_time_format; diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index 9471c315d..d50a20de4 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -997,7 +997,8 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, sprintf (buf + strlen (buf), "%d", ptr_hotlist->buffer->number); - if ((gui_buffer_count_merged_buffers (ptr_hotlist->buffer->number) > 1) + if ((CONFIG_BOOLEAN(config_look_hotlist_names_merged_buffers) + && (gui_buffer_count_merged_buffers (ptr_hotlist->buffer->number) > 1)) || (display_name && (CONFIG_INTEGER(config_look_hotlist_names_count) != 0) && (names_count < CONFIG_INTEGER(config_look_hotlist_names_count)))) |