pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-26 12:56:37 +02:00
Code Activity

Merge remote-tracking branch 'origin/pr/1311'

Browse Source
This commit is contained in:
Sébastien Helleu
2019-02-23 11:17:02 +01:00
parent bdc905df16 8ac4a75969
commit 7b79fbbd09
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+7 -6
View File
@@ -2177,7 +2177,7 @@ COMMAND_CALLBACK(filter)
if (!ptr_filter->enabled)
{
ptr_filter->enabled = 1;
gui_filter_all_buffers ();
gui_filter_all_buffers (ptr_filter);
gui_chat_printf_date_tags (NULL, 0,
GUI_FILTER_TAG_NO_FILTER,
_("Filter \"%s\" enabled"),
@@ -2235,7 +2235,7 @@ COMMAND_CALLBACK(filter)
if (ptr_filter->enabled)
{
ptr_filter->enabled = 0;
gui_filter_all_buffers ();
gui_filter_all_buffers (ptr_filter);
gui_chat_printf_date_tags (NULL, 0,
GUI_FILTER_TAG_NO_FILTER,
_("Filter \"%s\" disabled"),
@@ -2289,7 +2289,7 @@ COMMAND_CALLBACK(filter)
if (ptr_filter)
{
ptr_filter->enabled ^= 1;
gui_filter_all_buffers ();
gui_filter_all_buffers (ptr_filter);
}
else
{
@@ -2330,7 +2330,7 @@ COMMAND_CALLBACK(filter)
argv_eol[5]);
if (ptr_filter)
{
gui_filter_all_buffers ();
gui_filter_all_buffers (ptr_filter);
gui_chat_printf (NULL, "");
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("Filter \"%s\" added:"),
@@ -2384,7 +2384,7 @@ COMMAND_CALLBACK(filter)
if (gui_filters)
{
gui_filter_free_all ();
gui_filter_all_buffers ();
gui_filter_all_buffers (NULL);
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("All filters have been deleted"));
}
@@ -2399,8 +2399,9 @@ COMMAND_CALLBACK(filter)
ptr_filter = gui_filter_search_by_name (argv[2]);
if (ptr_filter)
{
ptr_filter->enabled = 0; // disable before refilter
gui_filter_all_buffers (ptr_filter); // refilter before free
gui_filter_free (ptr_filter);
gui_filter_all_buffers ();
gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER,
_("Filter \"%s\" deleted"),
argv[2]);
src/core/wee-config.c
+1 -1
View File
@@ -1359,7 +1359,7 @@ config_weechat_init_after_read ()
}
/* apply filters on all buffers */
gui_filter_all_buffers ();
gui_filter_all_buffers (NULL);
config_change_look_nick_color_force (NULL, NULL, NULL);
}