diff options
| author | LemonBoy <LemonBoy@users.noreply.github.com> | 2016-09-04 12:11:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 12:11:02 +0200 |
| commit | e4f8abc973872d5a7b2de98d269a924b97d428ab (patch) | |
| tree | 3122d69b196fa97db16558c7e474dbad76aa0825 /src/fe-common | |
| parent | c8630acbafd6341cbf908ab7d011d87a8fd68b56 (diff) | |
| parent | 3429c1a0a0dd336505e068dcea2a15efbf5a3c57 (diff) | |
| download | irssi-e4f8abc973872d5a7b2de98d269a924b97d428ab.zip | |
Merge pull request #533 from dequis/statusmess
Set the default STATUSMSG to @ instead of @+ if it's missing
Diffstat (limited to 'src/fe-common')
| -rw-r--r-- | src/fe-common/irc/fe-irc-channels.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/fe-common/irc/fe-irc-channels.c b/src/fe-common/irc/fe-irc-channels.c index a2737fc3..0ec30003 100644 --- a/src/fe-common/irc/fe-irc-channels.c +++ b/src/fe-common/irc/fe-irc-channels.c @@ -41,7 +41,7 @@ int fe_channel_is_opchannel(IRC_SERVER_REC *server, const char *target) statusmsg = g_hash_table_lookup(server->isupport, "statusmsg"); if (statusmsg == NULL) - statusmsg = "@+"; + statusmsg = "@"; return strchr(statusmsg, *target) != NULL; } @@ -61,12 +61,9 @@ const char *fe_channel_skip_prefix(IRC_SERVER_REC *server, const char *target) statusmsg = g_hash_table_lookup(server->isupport, "statusmsg"); /* Hack: for bahamut 1.4 which sends neither STATUSMSG nor - * WALLCHOPS in 005, accept @#chan and @+#chan (but not +#chan) */ - if (statusmsg == NULL && *target != '@') - return target; - + * WALLCHOPS in 005 */ if (statusmsg == NULL) - statusmsg = "@+"; + statusmsg = "@"; /* Strip the leading statusmsg prefixes */ while (strchr(statusmsg, *target) != NULL) { |