From a07c87bcbe00b048c682f1ce20fade166a7750ac Mon Sep 17 00:00:00 2001 From: Eijebong Date: Tue, 11 Apr 2017 13:42:51 +0200 Subject: Fix the resource duplication when reconnecting while auto_reconnect is true. The problem is that core.legitimate_disconnect is set to True in the on_connecting callback which is called before the session_end for some reasons. on_connecting sets core.legitimate_disconnect back to False so session_end thinks we've been disconnected and connects automagically adding a resource and thus duplicating everything. Moving the reset of legitimate_disconnect to the on_connected callback fixes the problem. --- poezio/core/core.py | 1 - poezio/core/handlers.py | 5 ----- 2 files changed, 6 deletions(-) diff --git a/poezio/core/core.py b/poezio/core/core.py index 35d50b65..be257c40 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -199,7 +199,6 @@ class Core(object): self.key_func.update(key_func) # Add handlers - self.xmpp.add_event_handler('connecting', self.handler.on_connecting) self.xmpp.add_event_handler('connected', self.handler.on_connected) self.xmpp.add_event_handler('connection_failed', self.handler.on_failed_connection) self.xmpp.add_event_handler('disconnected', self.handler.on_disconnected) diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py index 156f6b57..1e6e08ee 100644 --- a/poezio/core/handlers.py +++ b/poezio/core/handlers.py @@ -989,11 +989,6 @@ class HandlerCore: Remote host responded, but we are not yet authenticated """ self.core.information("Connected to server.", 'Info') - - def on_connecting(self, event): - """ - Just before we try to connect to the server - """ self.core.legitimate_disconnect = False def on_session_start(self, event): -- cgit v1.2.3