diff -Nru irssi-0.8.12.orig/src/irc/core/irc-servers-reconnect.c irssi-0.8.12/src/irc/core/irc-servers-reconnect.c --- irssi-0.8.12.orig/src/irc/core/irc-servers-reconnect.c 2008-07-28 18:32:03.000000000 +0100 +++ irssi-0.8.12/src/irc/core/irc-servers-reconnect.c 2008-07-28 19:15:33.000000000 +0100 @@ -97,22 +97,12 @@ server->nick_collision = TRUE; } -static void event_kill(IRC_SERVER_REC *server, const char *data, - const char *nick, const char *addr) -{ - if (addr != NULL && !server->nick_collision) { - /* don't reconnect if we were killed by an oper (not server) */ - server->no_reconnect = TRUE; - } -} - void irc_servers_reconnect_init(void) { signal_add("server connect copy", (SIGNAL_FUNC) sig_server_connect_copy); signal_add("server reconnect save status", (SIGNAL_FUNC) sig_server_reconnect_save_status); signal_add("event connected", (SIGNAL_FUNC) sig_connected); signal_add("event 436", (SIGNAL_FUNC) event_nick_collision); - signal_add("event kill", (SIGNAL_FUNC) event_kill); } void irc_servers_reconnect_deinit(void) @@ -121,5 +111,4 @@ signal_remove("server reconnect save status", (SIGNAL_FUNC) sig_server_reconnect_save_status); signal_remove("event connected", (SIGNAL_FUNC) sig_connected); signal_remove("event 436", (SIGNAL_FUNC) event_nick_collision); - signal_remove("event kill", (SIGNAL_FUNC) event_kill); }