aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

[irc_]channels_setup_[de]init() calls were in wrong places.

Browse Source 
Reconnection forgot to join to old channels after the first
reconnection try.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@744 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-10-14 01:43:05 +00:00 committed by cras
parent 46424964de
commit 015a598fa3
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/channels.c
View File

@ -155,7 +155,7 @@ static void event_connected(SERVER_REC *server)
static int match_nick_flags(SERVER_REC *server, NICK_REC *nick, char flag) static int match_nick_flags(SERVER_REC *server, NICK_REC *nick, char flag)
{ {
char *flags = server->get_nick_flags(); const char *flags = server->get_nick_flags();
return (flag == flags[0] && nick->op) || return (flag == flags[0] && nick->op) ||
(flag == flags[1] && (nick->voice || nick->halfop || (flag == flags[1] && (nick->voice || nick->halfop ||
@ -203,11 +203,15 @@ void channel_send_autocommands(CHANNEL_REC *channel)
void channels_init(void) void channels_init(void)
{ {
channels_setup_init();
signal_add("event connected", (SIGNAL_FUNC) event_connected); signal_add("event connected", (SIGNAL_FUNC) event_connected);
} }
void channels_deinit(void) void channels_deinit(void)
{ {
channels_setup_deinit();
signal_remove("event connected", (SIGNAL_FUNC) event_connected); signal_remove("event connected", (SIGNAL_FUNC) event_connected);
module_uniq_destroy("CHANNEL"); module_uniq_destroy("CHANNEL");
} }

1
src/core/servers-reconnect.c
View File

@ -115,6 +115,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src)
g_return_val_if_fail(dest != NULL, NULL); g_return_val_if_fail(dest != NULL, NULL);
dest->type = module_get_uniq_id("SERVER CONNECT", 0); dest->type = module_get_uniq_id("SERVER CONNECT", 0);
dest->reconnection = src->reconnection;
dest->proxy = g_strdup(src->proxy); dest->proxy = g_strdup(src->proxy);
dest->proxy_port = src->proxy_port; dest->proxy_port = src->proxy_port;
dest->proxy_string = g_strdup(src->proxy_string); dest->proxy_string = g_strdup(src->proxy_string);

7
src/irc/core/irc-channels.c
View File

@ -38,6 +38,9 @@ void channels_query_deinit(void);
void channel_events_init(void); void channel_events_init(void);
void channel_events_deinit(void); void channel_events_deinit(void);
void irc_channels_setup_init(void);
void irc_channels_setup_deinit(void);
void massjoin_init(void); void massjoin_init(void);
void massjoin_deinit(void); void massjoin_deinit(void);
@ -202,7 +205,7 @@ void irc_channels_init(void)
channel_events_init(); channel_events_init();
channel_rejoin_init(); /* after channel_events_init() */ channel_rejoin_init(); /* after channel_events_init() */
channels_query_init(); channels_query_init();
channels_setup_init(); irc_channels_setup_init();
bans_init(); bans_init();
modes_init(); modes_init();
@ -220,7 +223,7 @@ void irc_channels_deinit(void)
channel_events_deinit(); channel_events_deinit();
channel_rejoin_deinit(); channel_rejoin_deinit();
channels_query_deinit(); channels_query_deinit();
channels_setup_deinit(); irc_channels_setup_deinit();
bans_deinit(); bans_deinit();
modes_deinit(); modes_deinit();

5
src/irc/core/irc-core.c
View File

@ -45,9 +45,6 @@ void irc_log_deinit(void);
void lag_init(void); void lag_init(void);
void lag_deinit(void); void lag_deinit(void);
void irc_channels_setup_init(void);
void irc_channels_setup_deinit(void);
void irc_core_init(void) void irc_core_init(void)
{ {
CHAT_PROTOCOL_REC *rec; CHAT_PROTOCOL_REC *rec;
@ -65,7 +62,6 @@ void irc_core_init(void)
irc_queries_init(); irc_queries_init();
ctcp_init(); ctcp_init();
irc_channels_setup_init();
irc_commands_init(); irc_commands_init();
irc_irc_init(); irc_irc_init();
lag_init(); lag_init();
@ -83,7 +79,6 @@ void irc_core_deinit(void)
netsplit_deinit(); netsplit_deinit();
lag_deinit(); lag_deinit();
irc_commands_deinit(); irc_commands_deinit();
irc_channels_setup_deinit();
ctcp_deinit(); ctcp_deinit();
irc_queries_deinit(); irc_queries_deinit();