summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0115
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-07-09 22:22:05 -0700
committerLance Stout <lancestout@gmail.com>2012-07-09 22:22:05 -0700
commit1baae1b81ef0765c0f069e67911d7c5224bb4800 (patch)
tree3cda0c55cba81bce3390323e3323dc740030f7bc /sleekxmpp/plugins/xep_0115
parent7d20f0e9a6cbb9d45b167aca8563d45baf2a112a (diff)
downloadslixmpp-1baae1b81ef0765c0f069e67911d7c5224bb4800.tar.gz
slixmpp-1baae1b81ef0765c0f069e67911d7c5224bb4800.tar.bz2
slixmpp-1baae1b81ef0765c0f069e67911d7c5224bb4800.tar.xz
slixmpp-1baae1b81ef0765c0f069e67911d7c5224bb4800.zip
Fix issues of disco info leaking between entities with the same bare JIDs.
To ensure that disco info, or any settings which depend on the bound JID, are correct, only set such information on or after the session_bound event has fired.
Diffstat (limited to 'sleekxmpp/plugins/xep_0115')
-rw-r--r--sleekxmpp/plugins/xep_0115/caps.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/sleekxmpp/plugins/xep_0115/caps.py
index b0cba42d..9c93486b 100644
--- a/sleekxmpp/plugins/xep_0115/caps.py
+++ b/sleekxmpp/plugins/xep_0115/caps.py
@@ -78,11 +78,12 @@ class XEP_0115(BasePlugin):
disco = self.xmpp['xep_0030']
self.static = StaticCaps(self.xmpp, disco.static)
- self.api.settings['client_bare'] = False
- self.api.settings['component_bare'] = False
for op in self._disco_ops:
self.api.register(getattr(self.static, op), op, default=True)
+ for op in ('supports', 'has_identity'):
+ self.xmpp['xep_0030'].api.register(getattr(self.static, op), op)
+
self._run_node_handler = disco._run_node_handler
disco.cache_caps = self.cache_caps