summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-04-08 16:00:07 -0400
committerLance Stout <lancestout@gmail.com>2012-04-08 16:00:07 -0400
commitf9d0ee824be43ae7879446917f8d8ae80070c74e (patch)
tree7bef3a8edfdc0daa312dbef417e5fe1d1a7f501a /sleekxmpp/plugins
parentaf099737ab43b20cf6684fe963e84ae3ef5a3354 (diff)
downloadslixmpp-f9d0ee824be43ae7879446917f8d8ae80070c74e.tar.gz
slixmpp-f9d0ee824be43ae7879446917f8d8ae80070c74e.tar.bz2
slixmpp-f9d0ee824be43ae7879446917f8d8ae80070c74e.tar.xz
slixmpp-f9d0ee824be43ae7879446917f8d8ae80070c74e.zip
Ensure that wrapped disco results retain requesting iq id.
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0030/disco.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0030/disco.py b/sleekxmpp/plugins/xep_0030/disco.py
index 6f5b48d3..a66ab935 100644
--- a/sleekxmpp/plugins/xep_0030/disco.py
+++ b/sleekxmpp/plugins/xep_0030/disco.py
@@ -333,8 +333,10 @@ class XEP_0030(BasePlugin):
if str(jid) == str(self.xmpp.boundjid):
local = True
jid = jid.full
+ elif jid in (None, ''):
+ local = True
- if local or jid in (None, ''):
+ if local:
log.debug("Looking up local disco#info data " + \
"for %s, node %s.", jid, node)
info = self.api['get_info'](jid, node,
@@ -629,6 +631,7 @@ class XEP_0030(BasePlugin):
iq['from'],
iq)
if isinstance(info, Iq):
+ info['id'] = iq['id']
info.send()
else:
iq.reply()