zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-11 04:43:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Autorejoin when join temporarily fails because of netsplit is handled

Browse source 
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
This commit is contained in:
Timo Sirainen 2000-10-14 00:45:16 +00:00 • committed by cras
commit 6a3efe49ab
8 changed files with 169 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/irc/core/irc-channels.c
View file

@ -21,15 +21,16 @@
#include "module.h"
#include "signals.h"
#include "misc.h"
#include "bans.h"
#include "irc-channels.h"
#include "channels-setup.h"
#include "irc.h"
#include "modes.h"
#include "levels.h"
#include "channels-setup.h"
#include "irc.h"
#include "bans.h"
#include "modes.h"
#include "mode-lists.h"
#include "irc-channels.h"
#include "irc-nicklist.h"
#include "channel-rejoin.h"
void channels_query_init(void);
void channels_query_deinit(void);
@ -37,9 +38,6 @@ void channels_query_deinit(void);
void channel_events_init(void);
void channel_events_deinit(void);
void channel_rejoin_init(void);
void channel_rejoin_deinit(void);
void massjoin_init(void);
void massjoin_deinit(void);
@ -104,12 +102,12 @@ static void irc_channels_join(IRC_SERVER_REC *server, const char *data,
int use_keys;
g_return_if_fail(data != NULL);
if (!IS_IRC_SERVER(server) || !server->connected)
cmd_return_error(CMDERR_NOT_CONNECTED);
g_return_if_fail(IS_IRC_SERVER(server) && server->connected);
if (*data == '\0') return;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channels, &keys))
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
&channels, &keys))
return;
if (*channels == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
chanlist = g_strsplit(channels, ",", -1);
keylist = g_strsplit(keys, ",", -1);
@ -202,7 +200,7 @@ void irc_channels_init(void)
signal_add("channel destroyed", (SIGNAL_FUNC) sig_channel_destroyed);
channel_events_init();
channel_rejoin_init();
channel_rejoin_init(); /* after channel_events_init() */
channels_query_init();
channels_setup_init();