diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-09 22:22:05 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-09 22:22:05 -0700 |
| commit | 1baae1b81ef0765c0f069e67911d7c5224bb4800 (patch) | |
| tree | 3cda0c55cba81bce3390323e3323dc740030f7bc /sleekxmpp/api.py | |
| parent | 7d20f0e9a6cbb9d45b167aca8563d45baf2a112a (diff) | |
| download | slixmpp-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/api.py')
| -rw-r--r-- | sleekxmpp/api.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/api.py b/sleekxmpp/api.py index 103de2ff..4004f5b7 100644 --- a/sleekxmpp/api.py +++ b/sleekxmpp/api.py @@ -99,7 +99,7 @@ class APIRegistry(object): """ self._setup(ctype, op) - if jid in (None, ''): + if not jid: jid = self.xmpp.boundjid if jid and not isinstance(jid, JID): jid = JID(jid) @@ -113,7 +113,7 @@ class APIRegistry(object): else: jid = jid.full else: - if self.settings[ctype].get('client_bare', True): + if self.settings[ctype].get('client_bare', False): jid = jid.bare else: jid = jid.full |