From 098714b3c40af20b09cafee4bb09c0fa64c6cb00 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 2 Oct 2012 09:25:30 -0700 Subject: Unclobber connected event handler names. Fixes issue #199 --- sleekxmpp/clientxmpp.py | 4 ++-- sleekxmpp/xmlstream/xmlstream.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py index 9aa64256..7577b7da 100644 --- a/sleekxmpp/clientxmpp.py +++ b/sleekxmpp/clientxmpp.py @@ -95,7 +95,7 @@ class ClientXMPP(BaseXMPP): self.bound = False self.bindfail = False - self.add_event_handler('connected', self._handle_connected) + self.add_event_handler('connected', self._reset_connection_state) self.add_event_handler('session_bind', self._handle_session_bind) self.register_stanza(StreamFeatures) @@ -253,7 +253,7 @@ class ClientXMPP(BaseXMPP): self._handle_roster(response) return response - def _handle_connected(self, event=None): + def _reset_connection_state(self, event=None): #TODO: Use stream state here self.authenticated = False self.sessionstarted = False diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index dff32461..4cc1ac21 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -335,7 +335,7 @@ class XMLStream(object): #: ``_xmpp-client._tcp`` service. self.dns_service = None - self.add_event_handler('connected', self._handle_connected) + self.add_event_handler('connected', self._session_timeout_check) self.add_event_handler('disconnected', self._remove_schedules) self.add_event_handler('session_start', self._start_keepalive) self.add_event_handler('session_start', self._cert_expiration) @@ -630,7 +630,7 @@ class XMLStream(object): serr.errno, serr.strerror) return False - def _handle_connected(self, event=None): + def _session_timeout_check(self, event=None): """ Add check to ensure that a session is established within a reasonable amount of time. -- cgit v1.2.3