From b0357a9692b89d8c50439348620f224982086cfb Mon Sep 17 00:00:00 2001 From: Fedor Brunner Date: Wed, 29 Jan 2014 14:42:14 +0100 Subject: [PATCH] Backed out changeset 4ba5c2f6386e I have submitted the 'tls_version' to the incorrect default branch. The correct submit was done in changeset 15331:b5831b64e5d2 , branch gajim_0.16 . --- src/common/config.py | 1 - src/common/connection.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index f3a6998d8..2cfa73c35 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -349,7 +349,6 @@ class Config: 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], - 'tls_version': [ opt_str, '1.0', '' ], 'cipher_list': [ opt_str, 'HIGH:!aNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], diff --git a/src/common/connection.py b/src/common/connection.py index 3f27510e0..f0d8887a3 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -1239,11 +1239,9 @@ class Connection(CommonConnection, ConnectionHandlers): if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS - tls_version = gajim.config.get_per('accounts', self.name, - 'tls_version') cipher_list = gajim.config.get_per('accounts', self.name, 'cipher_list') - secure_tuple = (self._current_type, cacerts, mycerts, tls_version, cipher_list) + secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,