diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-10-08 22:40:03 +0100 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2016-10-08 22:40:03 +0100 |
| commit | 5369778bb9141da4e94ff400d66a924f9298c43f (patch) | |
| tree | 4f1da4b627e8a5bf70c026ebe903612184b451df /poezio | |
| parent | 3a608c191f0eb35993e2a672adbdd5ac883f4dca (diff) | |
| download | poezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.gz poezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.bz2 poezio-5369778bb9141da4e94ff400d66a924f9298c43f.tar.xz poezio-5369778bb9141da4e94ff400d66a924f9298c43f.zip | |
Remove the resource option from the configuration.no-resource
It’s considered bad practice nowadays to force a specific resource, it
can lead to presence leaks or reconnection loops so should be avoided.
Moreover this was already possible in the jid option, by setting it to
user@domain/resource, setting it would append it a second time in that
case.
Diffstat (limited to 'poezio')
| -rw-r--r-- | poezio/config.py | 1 | ||||
| -rw-r--r-- | poezio/connection.py | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/poezio/config.py b/poezio/config.py index 15380b8b..f2002382 100644 --- a/poezio/config.py +++ b/poezio/config.py @@ -95,7 +95,6 @@ DEFAULT_CONFIG = { 'private_auto_response': '', 'remote_fifo_path': './', 'request_message_receipts': True, - 'resource': '', 'rooms': '', 'roster_group_sort': 'name', 'roster_show_offline': False, diff --git a/poezio/connection.py b/poezio/connection.py index 7b12a6eb..be030497 100644 --- a/poezio/connection.py +++ b/poezio/connection.py @@ -32,8 +32,6 @@ class Connection(slixmpp.ClientXMPP): """ __init = False def __init__(self): - resource = config.get('resource') - keyfile = config.get('keyfile') certfile = config.get('certfile') @@ -43,8 +41,6 @@ class Connection(slixmpp.ClientXMPP): # depending on this setting self.anon = False jid = '%s' % config.get('jid') - if resource: - jid = '%s/%s'% (jid, resource) password = config.get('password') eval_password = config.get('eval_password') if not password and not eval_password and not (keyfile and certfile): @@ -63,8 +59,6 @@ class Connection(slixmpp.ClientXMPP): else: # anonymous auth self.anon = True jid = config.get('server') - if resource: - jid = '%s/%s' % (jid, resource) password = None jid = safeJID(jid) # TODO: use the system language |