From 2c39906816944ee5641511a6902a79048e117ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Thu, 4 May 2023 21:56:38 +0200 Subject: irc: rename constant IRC_COMMAND_CAP_SUPPORTED_COMPLETION to IRC_COMMAND_CAP_SUPPORTED --- src/plugins/irc/irc-command.c | 4 ++-- src/plugins/irc/irc-command.h | 7 +++++-- src/plugins/irc/irc-protocol.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 35c618d54..c8c7ea61d 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -6975,8 +6975,8 @@ irc_command_init () " /cap req -away-notify"), "ls" " || list" - " || req " IRC_COMMAND_CAP_SUPPORTED_COMPLETION "|%*" - " || ack " IRC_COMMAND_CAP_SUPPORTED_COMPLETION "|%*" + " || req " IRC_COMMAND_CAP_SUPPORTED "|%*" + " || ack " IRC_COMMAND_CAP_SUPPORTED "|%*" " || end", &irc_command_cap, NULL, NULL); weechat_hook_command ( diff --git a/src/plugins/irc/irc-command.h b/src/plugins/irc/irc-command.h index e97372edf..7a57dfbb8 100644 --- a/src/plugins/irc/irc-command.h +++ b/src/plugins/irc/irc-command.h @@ -53,8 +53,11 @@ struct t_irc_channel; return WEECHAT_RC_OK; \ } -/* list of supported capabilities (for completion in command /cap) */ -#define IRC_COMMAND_CAP_SUPPORTED_COMPLETION \ +/* + * list of supported capabilities + * (enabled if supported by the server + completion in command /cap) + */ +#define IRC_COMMAND_CAP_SUPPORTED \ "account-notify|away-notify|batch|cap-notify|chghost|" \ "extended-join|invite-notify|message-tags|multi-prefix|" \ "server-time|setname|userhost-in-names" diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index b3eb2d226..3ba8a45c1 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -754,7 +754,7 @@ irc_protocol_cap_to_enable (const char *capabilities, int sasl_requested) if (strcmp (caps[i], "*") == 0) { supported_caps = weechat_string_replace ( - IRC_COMMAND_CAP_SUPPORTED_COMPLETION, + IRC_COMMAND_CAP_SUPPORTED, "|", ","); if (supported_caps) -- cgit v1.2.3