diff options
| author | Timo Sirainen <cras@irssi.org> | 2000-10-14 01:43:05 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2000-10-14 01:43:05 +0000 |
| commit | 015a598fa32e40c68dd87241b72e8933ec404c29 (patch) | |
| tree | cc2a5c3a27412b3a99b857054e75d9d7b883f33e /src/core | |
| parent | 46424964de1fb4cb4faea067ada226978d1066a7 (diff) | |
| download | irssi-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/core')
| -rw-r--r-- | src/core/channels.c | 6 | ||||
| -rw-r--r-- | src/core/servers-reconnect.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/core/channels.c b/src/core/channels.c index c21758af..583280af 100644 --- a/src/core/channels.c +++ b/src/core/channels.c @@ -155,7 +155,7 @@ static void event_connected(SERVER_REC *server) 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) || (flag == flags[1] && (nick->voice || nick->halfop || @@ -203,11 +203,15 @@ void channel_send_autocommands(CHANNEL_REC *channel) void channels_init(void) { + channels_setup_init(); + signal_add("event connected", (SIGNAL_FUNC) event_connected); } void channels_deinit(void) { + channels_setup_deinit(); + signal_remove("event connected", (SIGNAL_FUNC) event_connected); module_uniq_destroy("CHANNEL"); } diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 00b3f132..54de8d38 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -115,6 +115,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src) g_return_val_if_fail(dest != NULL, NULL); dest->type = module_get_uniq_id("SERVER CONNECT", 0); + dest->reconnection = src->reconnection; dest->proxy = g_strdup(src->proxy); dest->proxy_port = src->proxy_port; dest->proxy_string = g_strdup(src->proxy_string); |