summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0050
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-08-26 22:04:06 -0700
committerLance Stout <lancestout@gmail.com>2011-08-26 22:06:32 -0700
commit2d90deb96a86af6d8365994caa26a1ec1474a065 (patch)
treed099e1e63f89896d6609566e895b1052f4827b8f /sleekxmpp/plugins/xep_0050
parent3fb3f63e5130dff83fe44a94b5849b919baa89ef (diff)
downloadslixmpp-2d90deb96a86af6d8365994caa26a1ec1474a065.tar.gz
slixmpp-2d90deb96a86af6d8365994caa26a1ec1474a065.tar.bz2
slixmpp-2d90deb96a86af6d8365994caa26a1ec1474a065.tar.xz
slixmpp-2d90deb96a86af6d8365994caa26a1ec1474a065.zip
The ifrom parameter doesn't need special treatment.
Diffstat (limited to 'sleekxmpp/plugins/xep_0050')
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index 54be1f86..5095f874 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -431,8 +431,7 @@ class xep_0050(base_plugin):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['to'] = jid
- if ifrom:
- iq['from'] = ifrom
+ iq['from'] = ifrom
iq['command']['node'] = node
iq['command']['action'] = action
if sessionid is not None:
@@ -482,9 +481,8 @@ class xep_0050(base_plugin):
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq['to'] = jid
- if ifrom:
- iq['from'] = ifrom
- session['from'] = ifrom
+ iq['from'] = ifrom
+ session['from'] = ifrom
iq['command']['node'] = node
iq['command']['action'] = 'execute'
sessionid = 'client:pending_' + iq['id']