summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-03-18 15:51:27 -0400
committerLance Stout <lancestout@gmail.com>2011-03-18 15:51:27 -0400
commitf65f88325b8d76a9b44a7cb4006a0a62d061e7ef (patch)
tree3567b06b11eea8494c4212ec8b9b8f3ae2d2c6d6
parent42c8f6ae877535c48424e5bcb8233f5d07dcfb7d (diff)
parent996ca52471931ccb3ac5a0f661e52fdc400db64b (diff)
downloadslixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.gz
slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.bz2
slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.tar.xz
slixmpp-f65f88325b8d76a9b44a7cb4006a0a62d061e7ef.zip
Merge branch 'develop' into roster
-rw-r--r--sleekxmpp/plugins/xep_0092/version.py2
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/sleekxmpp/plugins/xep_0092/version.py b/sleekxmpp/plugins/xep_0092/version.py
index fb3671e4..46bb27f7 100644
--- a/sleekxmpp/plugins/xep_0092/version.py
+++ b/sleekxmpp/plugins/xep_0092/version.py
@@ -42,7 +42,7 @@ class xep_0092(base_plugin):
self.xmpp.register_handler(
Callback('Software Version',
- StanzaPath('iq/software_version'),
+ StanzaPath('iq@=get/software_version'),
self._handle_version))
register_stanza_plugin(Iq, Version)
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 18d891a3..1c165562 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -353,8 +353,7 @@ class XMLStream(object):
self.send_raw(self.stream_footer)
# Wait for confirmation that the stream was
# closed in the other direction.
- if not reconnect:
- self.auto_reconnect = False
+ self.auto_reconnect = reconnect
self.stream_end_event.wait(4)
if not self.auto_reconnect:
self.stop.set()