diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-02 09:51:24 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-02 09:51:24 -0700 |
| commit | 84a2fc382b88133ce2398b1fac8c92196ddeb8dd (patch) | |
| tree | 22cc58f559341acfdac0800cfe0592eb930b7ceb /sleekxmpp | |
| parent | 44e7585bf8c7715eb0eaf348976b4c0fc0568722 (diff) | |
| parent | 098714b3c40af20b09cafee4bb09c0fa64c6cb00 (diff) | |
| download | slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.gz slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.bz2 slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.xz slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/clientxmpp.py | 4 | ||||
| -rw-r--r-- | 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. |