diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2009-06-13 20:03:00 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2009-06-13 20:03:00 +0200 |
| commit | 1f8532e668f8450d4bbacac56cd9e9014e600667 (patch) | |
| tree | b0f1d369cff21a6db446d6269a2bbee2bc1a7774 /src/gui | |
| parent | d686dc547c436ccba28cbbce50ecf50c7a61abe0 (diff) | |
| download | weechat-1f8532e668f8450d4bbacac56cd9e9014e600667.zip | |
Display buffer name in hotlist if buffers are merged with same number
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui-bar-item.c | 7 | ||||
| -rw-r--r-- | src/gui/gui-buffer.h | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index d4456820d..9471c315d 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -997,9 +997,10 @@ gui_bar_item_default_hotlist (void *data, struct t_gui_bar_item *item, sprintf (buf + strlen (buf), "%d", ptr_hotlist->buffer->number); - if (display_name - && (CONFIG_INTEGER(config_look_hotlist_names_count) != 0) - && (names_count < CONFIG_INTEGER(config_look_hotlist_names_count))) + if ((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)))) { names_count++; diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 58c251d6c..1df3529d7 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -224,6 +224,7 @@ extern struct t_gui_buffer *gui_buffer_search_by_name (const char *plugin, extern struct t_gui_buffer *gui_buffer_search_by_partial_name (const char *plugin, const char *name); extern struct t_gui_buffer *gui_buffer_search_by_number (int number); +extern int gui_buffer_count_merged_buffers (int number); extern int gui_buffer_is_scrolled (struct t_gui_buffer *buffer); extern void gui_buffer_clear (struct t_gui_buffer *buffer); extern void gui_buffer_clear_all (); |