summaryrefslogtreecommitdiff
path: root/sleekxmpp/clientxmpp.py
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/clientxmpp.py
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/clientxmpp.py')
-rw-r--r--sleekxmpp/clientxmpp.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index ec64664c..3fa158af 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -64,7 +64,6 @@ class ClientXMPP(BaseXMPP):
escape_quotes=True, sasl_mech=None, lang='en'):
BaseXMPP.__init__(self, jid, 'jabber:client')
- self.set_jid(jid)
self.escape_quotes = escape_quotes
self.plugin_config = plugin_config
self.plugin_whitelist = plugin_whitelist