summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-06-08 10:02:22 -0700
committerLance Stout <lancestout@gmail.com>2011-06-08 10:02:22 -0700
commit823c13707db1251b06a9bb06a2d41eb5d0851e94 (patch)
treea8e6b356fc54c9a3c8256ba796d1f27c32d34aca /sleekxmpp
parent8f9100c7620c1c00e6e6d817be1ad8ffc67cd1c5 (diff)
parent4266ee0fa4b2520ed930047ea73d6ac82d9b1f83 (diff)
downloadslixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.gz
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.bz2
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.tar.xz
slixmpp-823c13707db1251b06a9bb06a2d41eb5d0851e94.zip
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/componentxmpp.py2
-rw-r--r--sleekxmpp/plugins/xep_0050/adhoc.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py
index 8c380ddc..f9e7da4d 100644
--- a/sleekxmpp/componentxmpp.py
+++ b/sleekxmpp/componentxmpp.py
@@ -129,7 +129,7 @@ class ComponentXMPP(BaseXMPP):
handshake = ET.Element('{jabber:component:accept}handshake')
handshake.text = hashlib.sha1(pre_hash).hexdigest().lower()
- self.send_xml(handshake)
+ self.send_xml(handshake, now=True)
def _handle_handshake(self, xml):
"""
diff --git a/sleekxmpp/plugins/xep_0050/adhoc.py b/sleekxmpp/plugins/xep_0050/adhoc.py
index fe964e96..72c6c513 100644
--- a/sleekxmpp/plugins/xep_0050/adhoc.py
+++ b/sleekxmpp/plugins/xep_0050/adhoc.py
@@ -171,7 +171,7 @@ class xep_0050(base_plugin):
"""
if jid is None:
jid = self.xmpp.boundjid
- elif isinstance(jid, str):
+ elif not isinstance(jid, JID):
jid = JID(jid)
item_jid = jid.full