summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--doc/de/autogen/user/irc_options.txt4
-rw-r--r--doc/en/autogen/user/irc_options.txt4
-rw-r--r--doc/fr/autogen/user/irc_options.txt4
-rw-r--r--doc/it/autogen/user/irc_options.txt4
-rw-r--r--po/cs.po6
-rw-r--r--po/de.po6
-rw-r--r--po/es.po6
-rw-r--r--po/fr.po14
-rw-r--r--po/hu.po6
-rw-r--r--po/it.po6
-rw-r--r--po/pl.po6
-rw-r--r--po/pt_BR.po6
-rw-r--r--po/ru.po6
-rw-r--r--po/weechat.pot6
-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
20 files changed, 68 insertions, 67 deletions
diff --git a/ChangeLog b/ChangeLog
index 5980665a6..6ecc02854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,8 @@ Version 0.3.7 (under dev!)
* aspell: fix URL detection (do not check spelling of URLs) (bug #34040)
* irc: fix memory leak in SASL/blowfish authentication
* irc: fix memory leak when a server is deleted
-* irc: add option "cap" in servers to enable capabilities on connection
+* irc: add option "capabilities" in servers to enable client capabilities on
+ connection
* irc: add signal "irc_server_opened"
* irc: add signal "xxx,irc_out1_yyy" and modifier "irc_out1_xxx" (outgoing
message before automatic split to fit in 512 bytes)
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index c7f17ddea..1a7bf32e7 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -418,8 +418,8 @@
** Typ: integer
** Werte: 0 .. 1000000 (Standardwert: `25`)
-* [[option_irc.server_default.cap]] *irc.server_default.cap*
-** Beschreibung: `comma-separated list of capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
+* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
+** Beschreibung: `comma-separated list of client capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index a2c5ede28..5f8cc608e 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -418,8 +418,8 @@
** type: integer
** values: 0 .. 1000000 (default value: `25`)
-* [[option_irc.server_default.cap]] *irc.server_default.cap*
-** description: `comma-separated list of capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
+* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
+** description: `comma-separated list of client capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
** type: string
** values: any string (default value: `""`)
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index df12a8550..6ee29a32d 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -418,8 +418,8 @@
** type: entier
** valeurs: 0 .. 1000000 (valeur par défaut: `25`)
-* [[option_irc.server_default.cap]] *irc.server_default.cap*
-** description: `liste séparée par des virgules de capacités ("capabilities") à activer sur le serveur si elles sont disponibles (exemple: "multi-prefix,extended-join")`
+* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
+** description: `liste séparée par des virgules de capacités client ("client capabilities") à activer sur le serveur si elles sont disponibles (exemple: "multi-prefix,extended-join")`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index 1b54da450..e5691896b 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -418,8 +418,8 @@
** tipo: intero
** valori: 0 .. 1000000 (valore predefinito: `25`)
-* [[option_irc.server_default.cap]] *irc.server_default.cap*
-** descrizione: `comma-separated list of capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
+* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
+** descrizione: `comma-separated list of client capabilities to enable for server if they are available (example: "multi-prefix,extended-join")`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
diff --git a/po/cs.po b/po/cs.po
index 10574dc16..89f147646 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5322,9 +5322,9 @@ msgstr "ověřit, že je ssl spojení zcela důvěryhodné"
msgid "password for server"
msgstr "heslo pro server"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 9523ff65f..7978d53f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2012-01-29 14:32+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -5679,9 +5679,9 @@ msgstr "Überprüfe ob die SSL-Verbindung vertrauenswürdig ist"
msgid "password for server"
msgstr "Passwort für den Server"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/es.po b/po/es.po
index dfdd4f4a1..13648a0ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5504,9 +5504,9 @@ msgstr "verificar que la conexión SSL es confiable completamente"
msgid "password for server"
msgstr "contraseña del servidor"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 9ca2d3599..8bd2035e5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
-"PO-Revision-Date: 2012-02-19 10:45+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
+"PO-Revision-Date: 2012-02-19 19:59+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -5558,14 +5558,14 @@ msgstr "vérifier que la connexion ssl est entièrement de confiance"
msgid "password for server"
msgstr "mot de passe pour le serveur"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
-"liste séparée par des virgules de capacités (\"capabilities\") à activer sur "
-"le serveur si elles sont disponibles (exemple: \"multi-prefix,extended-join"
-"\")"
+"liste séparée par des virgules de capacités client (\"client capabilities\") "
+"à activer sur le serveur si elles sont disponibles (exemple: \"multi-prefix,"
+"extended-join\")"
msgid "mechanism for SASL authentication"
msgstr "mécanisme pour l'authentification SASL"
diff --git a/po/hu.po b/po/hu.po
index 374e1dabc..d45e5a6d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4921,9 +4921,9 @@ msgstr ""
msgid "password for server"
msgstr "jelszó az IRC szerveren"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 368287e33..7dfa9851b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2012-02-05 22:24+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5503,9 +5503,9 @@ msgstr "verifica che la connessione ssl sia totalmente fidata"
msgid "password for server"
msgstr "password per il server"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index fb859ee48..e8ad92310 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5472,9 +5472,9 @@ msgstr "sprawdź czy połączenie ssl jest w pełni zaufane"
msgid "password for server"
msgstr "hasło dla serwera"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 066dea5f9..50efacf7c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2011-12-25 22:56+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5075,9 +5075,9 @@ msgstr "verificar que a conexão SSL é totalmente confiável"
msgid "password for server"
msgstr "senha para o servidor"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index f194f8493..090bd54bd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.7-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: 2012-01-07 09:24+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4940,9 +4940,9 @@ msgstr ""
msgid "password for server"
msgstr "пароль, используемый при подключении к IRC серверу"
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 6735375eb..48d01a72f 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-02-19 18:55+0100\n"
+"POT-Creation-Date: 2012-02-19 20:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -4243,9 +4243,9 @@ msgstr ""
msgid "password for server"
msgstr ""
-#. TRANSLATORS: please keep word "capabilities" between brackets if translation is different (see fr.po)
+#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid ""
-"comma-separated list of capabilities to enable for server if they are "
+"comma-separated list of client capabilities to enable for server if they are "
"available (example: \"multi-prefix,extended-join\")"
msgstr ""
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 09:26:39 +0000