diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2020-06-21 10:21:22 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2020-06-21 10:22:04 +0200 |
| commit | 4a42cda3a5f5b02d8ba9afae129499c26250d334 (patch) | |
| tree | afa7b2b9988dcfe89321d5653fa4c0fccadd72ce /src/plugins/irc | |
| parent | 944661045252f38b08e1da32904317370b36cf74 (diff) | |
| download | weechat-4a42cda3a5f5b02d8ba9afae129499c26250d334.zip | |
irc: change default chantypes from "#&+!" to "#&"
The default chantypes was conflicting with
irc_server_prefix_chars_default ("@+").
Diffstat (limited to 'src/plugins/irc')
| -rw-r--r-- | src/plugins/irc/irc-channel.c | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-channel.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/irc/irc-channel.c b/src/plugins/irc/irc-channel.c index d452a7580..98d407ba4 100644 --- a/src/plugins/irc/irc-channel.c +++ b/src/plugins/irc/irc-channel.c @@ -40,6 +40,10 @@ #include "irc-input.h" +/* default CHANTYPES */ +char *irc_channel_default_chantypes = "#&"; + + /* * Checks if a channel pointer is valid for a server. * @@ -671,7 +675,7 @@ irc_channel_is_channel (struct t_irc_server *server, const char *string) first_char[1] = '\0'; return (strpbrk (first_char, (server && server->chantypes) ? - server->chantypes : IRC_CHANNEL_DEFAULT_CHANTYPES)) ? + server->chantypes : irc_channel_default_chantypes)) ? 1 : 0; } diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h index 5f616b5f1..64f05f1f0 100644 --- a/src/plugins/irc/irc-channel.h +++ b/src/plugins/irc/irc-channel.h @@ -22,8 +22,6 @@ #include <time.h> -#define IRC_CHANNEL_DEFAULT_CHANTYPES "#&+!" - /* channel types */ #define IRC_CHANNEL_TYPE_UNKNOWN -1 #define IRC_CHANNEL_TYPE_CHANNEL 0 @@ -81,6 +79,8 @@ struct t_irc_channel struct t_irc_channel *next_channel; /* link to next channel */ }; +extern char *irc_channel_default_chantypes; + extern int irc_channel_valid (struct t_irc_server *server, struct t_irc_channel *channel); extern struct t_irc_channel *irc_channel_search (struct t_irc_server *server, |