diff options
author | Sebastien Helleu <flashcode@flashtux.org> | 2009-06-10 12:40:05 +0200 |
---|---|---|
committer | Sebastien Helleu <flashcode@flashtux.org> | 2009-06-10 12:40:05 +0200 |
commit | 8d58b81d83d9a5462f1b4aeb274a16a91ef213d1 (patch) | |
tree | 4bf0ef51ea845f54fa97012b1ebe9a85e24f1750 /src/gui/gui-bar-item.c | |
parent | fd31dbb97ec00ee49cec21c4731677c403c80564 (diff) | |
download | weechat-8d58b81d83d9a5462f1b4aeb274a16a91ef213d1.zip |
Add buffer merging feature, with /buffer merge/unmerge (task #7404)
Diffstat (limited to 'src/gui/gui-bar-item.c')
-rw-r--r-- | src/gui/gui-bar-item.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/gui-bar-item.c b/src/gui/gui-bar-item.c index f78dcea16..73a233db6 100644 --- a/src/gui/gui-bar-item.c +++ b/src/gui/gui-bar-item.c @@ -45,6 +45,7 @@ #include "gui-filter.h" #include "gui-hotlist.h" #include "gui-keyboard.h" +#include "gui-line.h" #include "gui-nicklist.h" #include "gui-window.h" @@ -881,7 +882,7 @@ gui_bar_item_default_buffer_filter (void *data, struct t_gui_bar_item *item, if (!window) window = gui_current_window; - if (!gui_filters_enabled || !gui_filters || !window->buffer->lines_hidden) + if (!gui_filters_enabled || !gui_filters || !window->buffer->lines->lines_hidden) return NULL; snprintf (buf, sizeof (buf), @@ -1366,6 +1367,10 @@ gui_bar_item_init () gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NUMBER]); gui_bar_item_hook_signal ("buffer_moved", gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NUMBER]); + gui_bar_item_hook_signal ("buffer_merged", + gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NUMBER]); + gui_bar_item_hook_signal ("buffer_unmerged", + gui_bar_item_names[GUI_BAR_ITEM_BUFFER_NUMBER]); /* buffer name */ gui_bar_item_new (NULL, |