summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/irc/irc-config.c8
-rw-r--r--src/plugins/irc/irc-display.c12
-rw-r--r--src/plugins/irc/irc-protocol.c2
-rw-r--r--src/plugins/irc/irc-server.c24
-rw-r--r--src/plugins/irc/irc-server.h2
5 files changed, 24 insertions, 24 deletions
diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c
index aed31feab..205741563 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -1446,13 +1446,13 @@ irc_config_server_new_option (struct t_config_file *config_file,
callback_change, callback_change_data,
NULL, NULL);
break;
- case IRC_SERVER_OPTION_CAP:
+ case IRC_SERVER_OPTION_CAPABILITIES:
new_option = weechat_config_new_option (
config_file, section,
option_name, "string",
- /* TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po) */
- N_("comma-separated list of capabilities to enable for server "
- "if they are available (example: "
+ /* TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) */
+ N_("comma-separated list of client capabilities to enable for "
+ "server if they are available (example: "
"\"multi-prefix,extended-join\")"),
NULL, 0, 0,
default_value, value,
diff --git a/src/plugins/irc/irc-display.c b/src/plugins/irc/irc-display.c
index ef16f0747..8bd2b343b 100644
--- a/src/plugins/irc/irc-display.c
+++ b/src/plugins/irc/irc-display.c
@@ -253,14 +253,14 @@ irc_display_server (struct t_irc_server *server, int with_detail)
weechat_printf (NULL, " password . . . . . . : %s%s",
IRC_COLOR_CHAT_VALUE,
_("(hidden)"));
- /* cap (capabilities) */
- if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CAP]))
- weechat_printf (NULL, " cap. . . . . . . . . : ('%s')",
- IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAP));
+ /* client capabilities */
+ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_CAPABILITIES]))
+ weechat_printf (NULL, " capabilities . . . . : ('%s')",
+ IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES));
else
- weechat_printf (NULL, " cap. . . . . . . . . : %s'%s'",
+ weechat_printf (NULL, " capabilities . . . . : %s'%s'",
IRC_COLOR_CHAT_VALUE,
- weechat_config_string (server->options[IRC_SERVER_OPTION_CAP]));
+ weechat_config_string (server->options[IRC_SERVER_OPTION_CAPABILITIES]));
/* sasl_mechanism */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_printf (NULL, " sasl_mechanism . . . : ('%s')",
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index ce02d15bb..17aea6459 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -227,7 +227,7 @@ IRC_PROTOCOL_CALLBACK(cap)
sasl_requested = irc_server_sasl_enabled (server);
sasl_to_do = 0;
ptr_cap_option = IRC_SERVER_OPTION_STRING(server,
- IRC_SERVER_OPTION_CAP);
+ IRC_SERVER_OPTION_CAPABILITIES);
length = ((ptr_cap_option && ptr_cap_option[0]) ? strlen (ptr_cap_option) : 0) + 16;
cap_option = malloc (length);
cap_req = malloc (length);
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index 31fa2b5b2..f2bfeac3a 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -68,7 +68,7 @@ struct t_irc_message *irc_msgq_last_msg = NULL;
char *irc_server_option_string[IRC_SERVER_NUM_OPTIONS] =
{ "addresses", "proxy", "ipv6",
"ssl", "ssl_cert", "ssl_priorities", "ssl_dhkey_size", "ssl_verify",
- "password", "cap",
+ "password", "capabilities",
"sasl_mechanism", "sasl_username", "sasl_password", "sasl_timeout",
"autoconnect", "autoreconnect", "autoreconnect_delay",
"nicks", "username", "realname", "local_hostname",
@@ -2711,12 +2711,12 @@ irc_server_reconnect_schedule (struct t_irc_server *server)
void
irc_server_login (struct t_irc_server *server)
{
- const char *password, *username, *realname, *cap;
+ const char *password, *username, *realname, *capabilities;
password = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PASSWORD);
username = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME);
realname = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_REALNAME);
- cap = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAP);
+ capabilities = IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES);
if (password && password[0])
irc_server_sendf (server, 0, NULL, "PASS %s", password);
@@ -2731,7 +2731,7 @@ irc_server_login (struct t_irc_server *server)
else
server->nick_first_tried = irc_server_get_nick_index (server);
- if (irc_server_sasl_enabled (server) || (cap && cap[0]))
+ if (irc_server_sasl_enabled (server) || (capabilities && capabilities[0]))
{
irc_server_sendf (server, 0, NULL, "CAP LS");
}
@@ -4310,8 +4310,8 @@ irc_server_add_to_infolist (struct t_infolist *infolist,
if (!weechat_infolist_new_var_string (ptr_item, "password",
IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_PASSWORD)))
return 0;
- if (!weechat_infolist_new_var_string (ptr_item, "cap",
- IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAP)))
+ if (!weechat_infolist_new_var_string (ptr_item, "capabilities",
+ IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_CAPABILITIES)))
return 0;
if (!weechat_infolist_new_var_integer (ptr_item, "sasl_mechanism",
IRC_SERVER_OPTION_INTEGER(server, IRC_SERVER_OPTION_SASL_MECHANISM)))
@@ -4530,13 +4530,13 @@ irc_server_print_log ()
weechat_log_printf (" password . . . . . . : null");
else
weechat_log_printf (" password . . . . . . : (hidden)");
- /* cap (capabilities) */
- if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_CAP]))
- weechat_log_printf (" cap. . . . . . . . . : null ('%s')",
- IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_CAP));
+ /* client capabilities */
+ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_CAPABILITIES]))
+ weechat_log_printf (" capabilities . . . . : null ('%s')",
+ IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_CAPABILITIES));
else
- weechat_log_printf (" cap. . . . . . . . . : '%s'",
- weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_CAP]));
+ weechat_log_printf (" capabilities . . . . : '%s'",
+ weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_CAPABILITIES]));
/* sasl_mechanism */
if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SASL_MECHANISM]))
weechat_log_printf (" sasl_mechanism . . . : null ('%s')",
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 9c347ded1..af5d6d1bb 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -42,7 +42,7 @@ enum t_irc_server_option
IRC_SERVER_OPTION_SSL_DHKEY_SIZE, /* Diffie Hellman key size */
IRC_SERVER_OPTION_SSL_VERIFY, /* check if the connection is trusted */
IRC_SERVER_OPTION_PASSWORD, /* password for server */
- IRC_SERVER_OPTION_CAP, /* capabilities to enable on server */
+ IRC_SERVER_OPTION_CAPABILITIES, /* client capabilities to enable */
IRC_SERVER_OPTION_SASL_MECHANISM,/* mechanism for SASL authentication */
IRC_SERVER_OPTION_SASL_USERNAME, /* username for SASL authentication */
IRC_SERVER_OPTION_SASL_PASSWORD, /* password for SASL authentication */
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 11:26:21 +0000