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

core: remove options trigger.color.trigger and trigger.color.trigger_disabled (issue #1820)

Browse Source 
These options are used instead:

- weechat.color.chat_status_disabled
- weechat.color.chat_status_enabled
This commit is contained in:
Sébastien Helleu
2023-05-01 20:16:59 +02:00
parent b8f9b83500
commit 385b1d0133
19 changed files with 31 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/trigger/trigger-buffer.c
+1 -1
View File
@@ -341,7 +341,7 @@ trigger_buffer_display_trigger (struct t_trigger *trigger,
weechat_color (weechat_config_string (trigger_config_color_identifier)),
context->id,
trigger_hook_type_string[weechat_config_integer (trigger->options[TRIGGER_OPTION_HOOK])],
weechat_color (weechat_config_string (trigger_config_color_trigger)),
weechat_color ("chat_status_enabled"),
trigger->name,
weechat_color ("chat_delimiters"),
weechat_color ("reset"),
src/plugins/trigger/trigger-command.c
+2 -6
View File
@@ -72,9 +72,7 @@ trigger_command_display_trigger_internal (const char *name,
weechat_printf_date_tags (
NULL, 0, "no_trigger",
" %s%s%s: %s%s%s%s%s%s%s",
(enabled) ?
weechat_color (weechat_config_string (trigger_config_color_trigger)) :
weechat_color (weechat_config_string (trigger_config_color_trigger_disabled)),
weechat_color ((enabled) ? "chat_status_enabled" : "chat_status_disabled"),
name,
weechat_color ("reset"),
hook,
@@ -217,9 +215,7 @@ trigger_command_display_trigger_internal (const char *name,
weechat_printf_date_tags (
NULL, 0, "no_trigger",
" %s%s%s: %s%s%s%s%s%s%s%s%s%s%s%s%s",
(enabled) ?
weechat_color (weechat_config_string (trigger_config_color_trigger)) :
weechat_color (weechat_config_string (trigger_config_color_trigger_disabled)),
weechat_color ((enabled) ? "chat_status_enabled": "chat_status_disabled"),
name,
weechat_color ("reset"),
hook,
src/plugins/trigger/trigger-config.c
-12
View File
@@ -780,18 +780,6 @@ trigger_config_init ()
N_("text color for replacement text (for regular expressions)"),
NULL, 0, 0, "cyan", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
trigger_config_color_trigger = weechat_config_new_option (
trigger_config_file, trigger_config_section_color,
"trigger", "color",
N_("text color for trigger name"),
NULL, 0, 0, "green", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
trigger_config_color_trigger_disabled = weechat_config_new_option (
trigger_config_file, trigger_config_section_color,
"trigger_disabled", "color",
N_("text color for disabled trigger name"),
NULL, 0, 0, "red", NULL, 0,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
}
/* trigger */
src/plugins/trigger/trigger-config.h
-2
View File
@@ -41,8 +41,6 @@ extern struct t_config_option *trigger_config_color_flag_post_action;
extern struct t_config_option *trigger_config_color_identifier;
extern struct t_config_option *trigger_config_color_regex;
extern struct t_config_option *trigger_config_color_replace;
extern struct t_config_option *trigger_config_color_trigger;
extern struct t_config_option *trigger_config_color_trigger_disabled;
extern char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS];