summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-10-14 01:43:05 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-10-14 01:43:05 +0000
commit015a598fa32e40c68dd87241b72e8933ec404c29 (patch)
treecc2a5c3a27412b3a99b857054e75d9d7b883f33e /src/irc
parent46424964de1fb4cb4faea067ada226978d1066a7 (diff)
downloadirssi-015a598fa32e40c68dd87241b72e8933ec404c29.zip
[irc_]channels_setup_[de]init() calls were in wrong places.
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
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/core/irc-channels.c7
-rw-r--r--src/irc/core/irc-core.c5
2 files changed, 5 insertions, 7 deletions
diff --git a/src/irc/core/irc-channels.c b/src/irc/core/irc-channels.c
index 7daba896..f759216c 100644
--- a/src/irc/core/irc-channels.c
+++ b/src/irc/core/irc-channels.c
@@ -38,6 +38,9 @@ void channels_query_deinit(void);
void channel_events_init(void);
void channel_events_deinit(void);
+void irc_channels_setup_init(void);
+void irc_channels_setup_deinit(void);
+
void massjoin_init(void);
void massjoin_deinit(void);
@@ -202,7 +205,7 @@ void irc_channels_init(void)
channel_events_init();
channel_rejoin_init(); /* after channel_events_init() */
channels_query_init();
- channels_setup_init();
+ irc_channels_setup_init();
bans_init();
modes_init();
@@ -220,7 +223,7 @@ void irc_channels_deinit(void)
channel_events_deinit();
channel_rejoin_deinit();
channels_query_deinit();
- channels_setup_deinit();
+ irc_channels_setup_deinit();
bans_deinit();
modes_deinit();
diff --git a/src/irc/core/irc-core.c b/src/irc/core/irc-core.c
index 7eb70bb1..b84c89fd 100644
--- a/src/irc/core/irc-core.c
+++ b/src/irc/core/irc-core.c
@@ -45,9 +45,6 @@ void irc_log_deinit(void);
void lag_init(void);
void lag_deinit(void);
-void irc_channels_setup_init(void);
-void irc_channels_setup_deinit(void);
-
void irc_core_init(void)
{
CHAT_PROTOCOL_REC *rec;
@@ -65,7 +62,6 @@ void irc_core_init(void)
irc_queries_init();
ctcp_init();
- irc_channels_setup_init();
irc_commands_init();
irc_irc_init();
lag_init();
@@ -83,7 +79,6 @@ void irc_core_deinit(void)
netsplit_deinit();
lag_deinit();
irc_commands_deinit();
- irc_channels_setup_deinit();
ctcp_deinit();
irc_queries_deinit();