summaryrefslogtreecommitdiff
path: root/sleekxmpp/clientxmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-02 09:51:24 -0700
committerLance Stout <lancestout@gmail.com>2012-10-02 09:51:24 -0700
commit84a2fc382b88133ce2398b1fac8c92196ddeb8dd (patch)
tree22cc58f559341acfdac0800cfe0592eb930b7ceb /sleekxmpp/clientxmpp.py
parent44e7585bf8c7715eb0eaf348976b4c0fc0568722 (diff)
parent098714b3c40af20b09cafee4bb09c0fa64c6cb00 (diff)
downloadslixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.gz
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.bz2
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.tar.xz
slixmpp-84a2fc382b88133ce2398b1fac8c92196ddeb8dd.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
-rw-r--r--sleekxmpp/clientxmpp.py4
1 files changed, 2 insertions, 2 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