summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-12-07 22:38:58 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-12-07 22:38:58 +0100
commitc832116caeb2d001bc9c765a59c1053e3ad1cc9d (patch)
treea7451f731da623d5217bfed738a436ad7817e38b /src/plugins
parent1aeeecb82d473a23737191bfd18c3cb6239d06f7 (diff)
downloadweechat-c832116caeb2d001bc9c765a59c1053e3ad1cc9d.zip
irc: rename option irc.look.ban_mask_default to irc.network.ban_mask_default
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/irc/irc-config.c20
-rw-r--r--src/plugins/irc/irc-config.h2
-rw-r--r--src/plugins/irc/irc-nick.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index ff02d9385..49d06b575 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -48,7 +48,6 @@ struct t_config_section *irc_config_section_server = NULL;
/* IRC config, look section */
-struct t_config_option *irc_config_look_ban_mask_default;
struct t_config_option *irc_config_look_buffer_switch_autojoin;
struct t_config_option *irc_config_look_buffer_switch_join;
struct t_config_option *irc_config_look_color_nicks_in_names;
@@ -125,6 +124,7 @@ struct t_config_option *irc_config_color_topic_old;
struct t_config_option *irc_config_network_alternate_nick;
struct t_config_option *irc_config_network_autoreconnect_delay_growing;
struct t_config_option *irc_config_network_autoreconnect_delay_max;
+struct t_config_option *irc_config_network_ban_mask_default;
struct t_config_option *irc_config_network_colors_receive;
struct t_config_option *irc_config_network_colors_send;
struct t_config_option *irc_config_network_lag_check;
@@ -2194,15 +2194,6 @@ irc_config_init ()
return 0;
}
- irc_config_look_ban_mask_default = weechat_config_new_option (
- irc_config_file, ptr_section,
- "ban_mask_default", "string",
- N_("default ban mask for commands /ban, /unban and /kickban; variables "
- "$nick, $user and $host are replaced by their values (extracted "
- "from \"nick!user@host\"); this default mask is used only if "
- "WeeChat knows the host for the nick"),
- NULL, 0, 0, "*!$user@$host", NULL, 0, NULL, NULL,
- NULL, NULL, NULL, NULL);
irc_config_look_buffer_switch_autojoin = weechat_config_new_option (
irc_config_file, ptr_section,
"buffer_switch_autojoin", "boolean",
@@ -2733,6 +2724,15 @@ irc_config_init ()
N_("maximum autoreconnect delay to server (in seconds, 0 = no maximum)"),
NULL, 0, 3600 * 24, "1800", NULL, 0, NULL, NULL,
NULL, NULL, NULL, NULL);
+ irc_config_network_ban_mask_default = weechat_config_new_option (
+ irc_config_file, ptr_section,
+ "ban_mask_default", "string",
+ N_("default ban mask for commands /ban, /unban and /kickban; variables "
+ "$nick, $user and $host are replaced by their values (extracted "
+ "from \"nick!user@host\"); this default mask is used only if "
+ "WeeChat knows the host for the nick"),
+ NULL, 0, 0, "*!$user@$host", NULL, 0, NULL, NULL,
+ NULL, NULL, NULL, NULL);
irc_config_network_colors_receive = weechat_config_new_option (
irc_config_file, ptr_section,
"colors_receive", "boolean",
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index 86bf03044..6a0759455 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -96,7 +96,6 @@ extern struct t_config_section *irc_config_section_ctcp;
extern struct t_config_section *irc_config_section_server_default;
extern struct t_config_section *irc_config_section_server;
-extern struct t_config_option *irc_config_look_ban_mask_default;
extern struct t_config_option *irc_config_look_buffer_switch_autojoin;
extern struct t_config_option *irc_config_look_buffer_switch_join;
extern struct t_config_option *irc_config_look_color_nicks_in_names;
@@ -169,6 +168,7 @@ extern struct t_config_option *irc_config_color_topic_old;
extern struct t_config_option *irc_config_network_alternate_nick;
extern struct t_config_option *irc_config_network_autoreconnect_delay_growing;
extern struct t_config_option *irc_config_network_autoreconnect_delay_max;
+extern struct t_config_option *irc_config_network_ban_mask_default;
extern struct t_config_option *irc_config_network_colors_receive;
extern struct t_config_option *irc_config_network_colors_send;
extern struct t_config_option *irc_config_network_lag_check;
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index 0968d4b4d..38adf52fb 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -1061,7 +1061,7 @@ irc_nick_default_ban_mask (struct t_irc_nick *nick)
if (!nick)
return NULL;
- ptr_ban_mask = weechat_config_string (irc_config_look_ban_mask_default);
+ ptr_ban_mask = weechat_config_string (irc_config_network_ban_mask_default);
pos_hostname = (nick->host) ? strchr (nick->host, '@') : NULL;