From bc504f90b1c4cfde3ebef4a822fa00a665830abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 2 May 2017 16:54:40 +0200 Subject: [PATCH] Make default proxy always available If the user had an empty `file_transfer_proxies` config setting no proxies were used. As we discover the default server proxy ourself the user should not have to write it to his config setting to make use of it. --- src/common/protocol/bytestream.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py index 28528663c..032f9b38c 100644 --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -519,9 +519,11 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): 'file_transfer_proxies') shall_use_proxies = gajim.config.get_per('accounts', self.name, 'use_ft_proxies') - if shall_use_proxies and configured_proxies: + if shall_use_proxies: proxyhost_dicts = [] - proxies = [item.strip() for item in configured_proxies.split(',')] + proxies = [] + if configured_proxies: + proxies = [item.strip() for item in configured_proxies.split(',')] default_proxy = gajim.proxy65_manager.get_default_for_name(self.name) if default_proxy: # add/move default proxy at top of the others