diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2020-10-18 09:35:04 +0200 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2020-10-18 09:35:04 +0200 |
| commit | 30e48336f46ff68598e9007445dbfa9f5dd00865 (patch) | |
| tree | 8c4884436ae79657d315f88c84efffbe396ef68e | |
| parent | 2807a8374b7a1bb717feb8c9fbc6e94a1d58fb78 (diff) | |
| download | weechat-30e48336f46ff68598e9007445dbfa9f5dd00865.zip | |
irc: remove SASL timeout message displayed by error after successful SASL authentication (closes #1515)
The SASL timer is removed immediately when the SASL authentication is
successful or has failed.
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | src/plugins/irc/irc-protocol.c | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 310b5c0db..fa51080ba 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -35,6 +35,7 @@ Bug fixes:: * core: set "notify_level" to 3 if there is a highlight in the line (issue #1529) * core: do not add line with highlight and tag "notify_none" to hotlist (issue #1529) + * irc: remove SASL timeout message displayed by error after successful SASL authentication (issue #1515) * irc: send all channels in a single JOIN command when reconnecting to the server (issue #1551) * script: do not automatically download list of scripts on startup if the file is too old (issue #1548) * spell: properly skip WeeChat and IRC color codes when checking words in input (issue #1547) diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index aab804e6d..8a6b3ac0b 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -6372,6 +6372,12 @@ IRC_PROTOCOL_CALLBACK(901) IRC_PROTOCOL_CALLBACK(sasl_end_ok) { + if (server->hook_timer_sasl) + { + weechat_unhook (server->hook_timer_sasl); + server->hook_timer_sasl = NULL; + } + irc_protocol_cb_numeric (server, date, nick, address, host, command, ignored, argc, argv, argv_eol); @@ -6393,6 +6399,12 @@ IRC_PROTOCOL_CALLBACK(sasl_end_fail) { int sasl_fail; + if (server->hook_timer_sasl) + { + weechat_unhook (server->hook_timer_sasl); + server->hook_timer_sasl = NULL; + } + irc_protocol_cb_numeric (server, date, nick, address, host, command, ignored, argc, argv, argv_eol); |