summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance stout <lancestout@gmail.com>2010-06-01 10:51:03 -0400
committerLance stout <lancestout@gmail.com>2010-06-01 10:51:03 -0400
commit01e8040a077d4fefdec2c599e75ea93918e9f538 (patch)
tree254b318b11f9d7abc28a72d2538e052fdfa50775 /sleekxmpp
parent332eea3b3bae719c707e99031660197b22fe41ce (diff)
downloadslixmpp-01e8040a077d4fefdec2c599e75ea93918e9f538.tar.gz
slixmpp-01e8040a077d4fefdec2c599e75ea93918e9f538.tar.bz2
slixmpp-01e8040a077d4fefdec2c599e75ea93918e9f538.tar.xz
slixmpp-01e8040a077d4fefdec2c599e75ea93918e9f538.zip
Added additional parameter to xep_0030's getInfo and getItems methods.
By using dfrom, a server component may send disco requests using any of its JIDS.
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/plugins/xep_0030.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0030.py b/sleekxmpp/plugins/xep_0030.py
index 2c8d4354..9fcc8b17 100644
--- a/sleekxmpp/plugins/xep_0030.py
+++ b/sleekxmpp/plugins/xep_0030.py
@@ -293,19 +293,19 @@ class xep_0030(base.base_plugin):
# Older interface methods for backwards compatibility
- def getInfo(self, jid, node=''):
+ def getInfo(self, jid, node='', dfrom=None):
iq = self.xmpp.Iq()
iq['type'] = 'get'
iq['to'] = jid
- iq['from'] = self.xmpp.fulljid
+ iq['from'] = dfrom
iq['disco_info']['node'] = node
iq.send()
- def getItems(self, jid, node=''):
+ def getItems(self, jid, node='', dfrom=None):
iq = self.xmpp.Iq()
iq['type'] = 'get'
iq['to'] = jid
- iq['from'] = self.xmpp.fulljid
+ iq['from'] = dfrom
iq['disco_items']['node'] = node
iq.send()