jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into roster

Browse Source
This commit is contained in:
Lance Stout 2011-03-18 15:51:27 -04:00
commit f65f88325b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sleekxmpp/plugins/xep_0092/version.py
View File

@ -42,7 +42,7 @@ class xep_0092(base_plugin):
self.xmpp.register_handler( self.xmpp.register_handler(
Callback('Software Version', Callback('Software Version',
StanzaPath('iq/software_version'), StanzaPath('iq@=get/software_version'),
self._handle_version)) self._handle_version))
register_stanza_plugin(Iq, Version) register_stanza_plugin(Iq, Version)

3
sleekxmpp/xmlstream/xmlstream.py
View File

@ -353,8 +353,7 @@ class XMLStream(object):
self.send_raw(self.stream_footer) self.send_raw(self.stream_footer)
# Wait for confirmation that the stream was # Wait for confirmation that the stream was
# closed in the other direction. # closed in the other direction.
if not reconnect: self.auto_reconnect = reconnect
self.auto_reconnect = False
self.stream_end_event.wait(4) self.stream_end_event.wait(4)
if not self.auto_reconnect: if not self.auto_reconnect:
self.stop.set() self.stop.set()