diff options
| author | Philipp Hörist <forenjunkie@chello.at> | 2017-05-02 17:54:40 +0300 |
|---|---|---|
| committer | Philipp Hörist <forenjunkie@chello.at> | 2017-05-02 17:56:44 +0300 |
| commit | 26a724856b8faa15a80a63207614151d51e7e1b1 (patch) | |
| tree | ffb39e39e7abe44a6641f085ce7381d7833f7088 | |
| parent | 48bb80b9695d31670cdd445990afb94ae8856666 (diff) | |
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.
| -rw-r--r-- | src/common/protocol/bytestream.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py index f95ec1a88..7fe923c0d 100644 --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -513,9 +513,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 |