copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Philipp Hörist 2017-05-02 16:54:40 +02:00
parent 30d3f0c2ba
commit bc504f90b1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/protocol/bytestream.py
View File

@ -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