summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-18 11:22:11 -0500
committerLance Stout <lancestout@gmail.com>2010-11-18 11:22:11 -0500
commit291b118aca29b32679f1b2e55d0de98918fe4455 (patch)
tree7e4fdbc532bbebea4a441d6e9ab5fe4076667ff0
parentdb7fb10e9593fae16db38435139ab56877431d80 (diff)
downloadslixmpp-291b118aca29b32679f1b2e55d0de98918fe4455.tar.gz
slixmpp-291b118aca29b32679f1b2e55d0de98918fe4455.tar.bz2
slixmpp-291b118aca29b32679f1b2e55d0de98918fe4455.tar.xz
slixmpp-291b118aca29b32679f1b2e55d0de98918fe4455.zip
XEP-0030 bug fixes.
-rw-r--r--sleekxmpp/plugins/xep_0030.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0030.py b/sleekxmpp/plugins/xep_0030.py
index e3589077..c8050809 100644
--- a/sleekxmpp/plugins/xep_0030.py
+++ b/sleekxmpp/plugins/xep_0030.py
@@ -253,7 +253,8 @@ class xep_0030(base.base_plugin):
A default handler for disco#info requests. If another
handler is registered, this one will defer and not run.
"""
- if not forwarded and self.xmpp.event_handled('disco_info_request'):
+ if not forwarded and \
+ self.xmpp.event_handled('disco_info_request') > 1:
return
node_name = iq['disco_info']['node']
@@ -281,7 +282,8 @@ class xep_0030(base.base_plugin):
If this handler is called by your own custom handler with
forwarded set to True, then it will run as normal.
"""
- if not forwarded and self.xmpp.event_handled('disco_items_request'):
+ if not forwarded and \
+ self.xmpp.event_handled('disco_items_request') > 1:
return
node_name = iq['disco_items']['node']