[Git][gajim/gajim][master] Respect global proxy setting

[@lovetox]

Philipp Hörist pushed to branch master at gajim / gajim


Commits:
6e30706f by lovetox at 2022-03-19T14:35:05+01:00
Respect global proxy setting

This has gone missing at some point

- - - - -


1 changed file:

- gajim/common/helpers.py


Changes:

=====================================
gajim/common/helpers.py
=====================================
@@ -714,7 +714,9 @@ def get_retraction_text(account: str, moderator_jid: str,
 def get_user_proxy(account: str) -> Optional[ProxyData]:
     proxy_name = app.settings.get_account_setting(account, 'proxy')
     if not proxy_name:
-        return None
+        proxy_name = app.settings.get('global_proxy')
+        if not proxy_name:
+            return None
     return get_proxy(proxy_name)
 
 def get_proxy(proxy_name: str) -> Optional[ProxyData]:



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/6e30706fdb2707a21716a2b5ad5874877d9ac2bd

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/6e30706fdb2707a21716a2b5ad5874877d9ac2bd
You're receiving this email because of your account on dev.gajim.org.



_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits