diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-10-14 00:45:16 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-10-14 00:45:16 +0000 |
| commit | 6a3efe49ab7b41062650da894eccc2d4be0b8f45 (patch) | |
| tree | e60a8f2eaaef04f87d9c8752f2742acc4f5e41bb /src/irc/core/channels-query.c | |
| parent | f850204479e84c3112b6353da48a5a1ec81bb1fe (diff) | |
| download | irssi-6a3efe49ab7b41062650da894eccc2d4be0b8f45.zip | |
Autorejoin when join temporarily fails because of netsplit is handled
better now. Irssi prints a nice message about it only once and you can
abort it with /RMREJOINS command.
"channel query" -> "channel joined"
channels_join() must not use cmd_return|param_error() commands since we
don't necessarily call it from command handler and signal_stop() could
cause some damage.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@739 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc/core/channels-query.c')
| -rw-r--r-- | src/irc/core/channels-query.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/irc/core/channels-query.c b/src/irc/core/channels-query.c index 96f17f4d..bb48ef9f 100644 --- a/src/irc/core/channels-query.c +++ b/src/irc/core/channels-query.c @@ -22,8 +22,8 @@ How the thing works: - - After channel is joined and NAMES list is got, send "channel query" signal - - "channel query" : add channel to server->quries lists + - After channel is joined and NAMES list is got, send "channel joined" signal + - "channel joined" : add channel to server->queries lists loop: - Wait for NAMES list from all channels before doing anything else.. @@ -304,11 +304,12 @@ static void channels_query_check(IRC_SERVER_REC *server) channel_send_query(server, query); } -static void sig_channel_query(IRC_CHANNEL_REC *channel) +static void sig_channel_joined(IRC_CHANNEL_REC *channel) { SERVER_QUERY_REC *rec; - g_return_if_fail(channel != NULL); + if (!IS_IRC_CHANNEL(channel)) + return; /* Add channel to query lists */ if (!channel->no_modes) @@ -567,7 +568,7 @@ void channels_query_init(void) { signal_add("server connected", (SIGNAL_FUNC) sig_connected); signal_add("server disconnected", (SIGNAL_FUNC) sig_disconnected); - signal_add("channel query", (SIGNAL_FUNC) sig_channel_query); + signal_add("channel joined", (SIGNAL_FUNC) sig_channel_joined); signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed); signal_add("chanquery mode", (SIGNAL_FUNC) event_channel_mode); @@ -584,7 +585,7 @@ void channels_query_deinit(void) { signal_remove("server connected", (SIGNAL_FUNC) sig_connected); signal_remove("server disconnected", (SIGNAL_FUNC) sig_disconnected); - signal_remove("channel query", (SIGNAL_FUNC) sig_channel_query); + signal_remove("channel joined", (SIGNAL_FUNC) sig_channel_joined); signal_remove("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed); signal_remove("chanquery mode", (SIGNAL_FUNC) event_channel_mode); |