From b5e9b07a07508689bf9b8509a0049aa55a1feef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 6 Jun 2017 21:24:27 +0200 Subject: [PATCH] Remove unused or old config values --- src/common/connection.py | 3 +-- src/config.py | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/common/connection.py b/src/common/connection.py index 24e3993c3..2c56277f6 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1007,7 +1007,7 @@ class Connection(CommonConnection, ConnectionHandlers): Start a connection to the XMPP server Returns connection, and connection type ('tls', 'ssl', 'plain', '') data - MUST contain hostname, usessl, proxy, use_custom_host, custom_host (if + MUST contain hostname, proxy, use_custom_host, custom_host (if use_custom_host), custom_port (if use_custom_host) """ if self.connection: @@ -1039,7 +1039,6 @@ class Connection(CommonConnection, ConnectionHandlers): custom_p = data['custom_port'] else: hostname = gajim.config.get_per('accounts', self.name, 'hostname') - usessl = gajim.config.get_per('accounts', self.name, 'usessl') self.try_connecting_for_foo_secs = gajim.config.get_per('accounts', self.name, 'try_connecting_for_foo_secs') proxy = helpers.get_proxy_info(self.name) diff --git a/src/config.py b/src/config.py index 50ac8e421..63b3d31d5 100644 --- a/src/config.py +++ b/src/config.py @@ -4026,14 +4026,12 @@ class AccountCreationWizardWindow: config['hostname'] = server config['savepass'] = savepass config['password'] = password - config['resource'] = 'Gajim' config['anonymous_auth'] = anonymous config['priority'] = 5 config['autoconnect'] = True config['no_log_for'] = '' config['sync_with_global_status'] = True config['proxy'] = '' - config['usessl'] = False config['use_custom_host'] = False config['custom_port'] = 0 config['custom_host'] = ''