summaryrefslogtreecommitdiff
path: root/sleekxmpp/features
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-24 13:00:01 -0700
committerLance Stout <lancestout@gmail.com>2012-10-24 13:00:01 -0700
commit14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (patch)
tree5e72741f828a0f1852086c6be83e23c7f94d10f1 /sleekxmpp/features
parent931d49560a1ebf3b767d20f8aeb692dd30a518c3 (diff)
parenta22ca228cc3a121da8bad4268c39bff5190db969 (diff)
downloadslixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.gz
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.bz2
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.tar.xz
slixmpp-14c9e9a9cc263a2695cb9d8e5575d60bd0a55197.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features')
-rw-r--r--sleekxmpp/features/feature_bind/bind.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/features/feature_bind/bind.py b/sleekxmpp/features/feature_bind/bind.py
index 0584b308..0f97952d 100644
--- a/sleekxmpp/features/feature_bind/bind.py
+++ b/sleekxmpp/features/feature_bind/bind.py
@@ -8,6 +8,7 @@
import logging
+from sleekxmpp.jid import JID
from sleekxmpp.stanza import Iq, StreamFeatures
from sleekxmpp.features.feature_bind import stanza
from sleekxmpp.xmlstream import register_stanza_plugin
@@ -48,7 +49,7 @@ class FeatureBind(BasePlugin):
iq['bind']['resource'] = self.xmpp.boundjid.resource
response = iq.send(now=True)
- self.xmpp.set_jid(response['bind']['jid'])
+ self.xmpp.boundjid = JID(response['bind']['jid'], cache_lock=True)
self.xmpp.bound = True
self.xmpp.event('session_bind', self.xmpp.boundjid, direct=True)
self.xmpp.session_bind_event.set()