summaryrefslogtreecommitdiff
path: root/src/connection.py
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2012-08-01 20:10:00 +0200
committermathieui <mathieui@mathieui.net>2012-08-01 20:10:00 +0200
commit0cb39b32a4ee3a2f86f6db6d2354836bcf68a33e (patch)
tree3f3fd1fab5194da4ebf0f0e980ff0bcfe662dc70 /src/connection.py
parentf76e80c5fae108d29ba87a495cd92a1f185c1da2 (diff)
downloadpoezio-0cb39b32a4ee3a2f86f6db6d2354836bcf68a33e.tar.gz
poezio-0cb39b32a4ee3a2f86f6db6d2354836bcf68a33e.tar.bz2
poezio-0cb39b32a4ee3a2f86f6db6d2354836bcf68a33e.tar.xz
poezio-0cb39b32a4ee3a2f86f6db6d2354836bcf68a33e.zip
Do not generate invalid jids (e.g. localpart@domainpart/)
This is in prevision of a sleekxmpp update with JID validation. Also, comment the “server” option in the config file a bit better.
Diffstat (limited to 'src/connection.py')
-rw-r--r--src/connection.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/connection.py b/src/connection.py
index 80c41ee8..f4db0816 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -34,7 +34,9 @@ class Connection(sleekxmpp.ClientXMPP):
self.anon = False # Field used to know if we are anonymous or not.
# many features will be handled diferently
# depending on this setting
- jid = '%s/%s' % (config.get('jid', ''), resource)
+ jid = '%s' % config.get('jid', '')
+ if resource:
+ jid = '%s/%s' (jid, resource)
password = config.get('password', '') or getpass.getpass()
else: # anonymous auth
self.anon = True