aboutsummaryrefslogtreecommitdiffstats
path: root/subsurface-core/qthelper.cpp
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-14 10:43:37 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-11-14 10:43:37 -0800
commit3453234a3b940fbc9703dd3bdb9e89561c2cd92c (patch)
tree0a12b1623f830aae40b4e96d7b51f5a23b520294 /subsurface-core/qthelper.cpp
parentb688f417de4ea246c4e7387232f9b9b8ca9b5318 (diff)
downloadsubsurface-3453234a3b940fbc9703dd3bdb9e89561c2cd92c.tar.gz
Missing half of the previous commit
Oops. I fixed the previous commit, tested the fix, and then forgot to update the commit and instead pushed it out. That was dumb. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-core/qthelper.cpp')
-rw-r--r--subsurface-core/qthelper.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp
index c1205ce6f..091e714de 100644
--- a/subsurface-core/qthelper.cpp
+++ b/subsurface-core/qthelper.cpp
@@ -1678,3 +1678,16 @@ extern "C" bool in_planner()
{
return (currentApplicationState == "PlanDive" || currentApplicationState == "EditPlannedDive");
}
+
+void init_proxy()
+{
+ QNetworkProxy proxy;
+ proxy.setType(QNetworkProxy::ProxyType(prefs.proxy_type));
+ proxy.setHostName(prefs.proxy_host);
+ proxy.setPort(prefs.proxy_port);
+ if (prefs.proxy_auth) {
+ proxy.setUser(prefs.proxy_user);
+ proxy.setPassword(prefs.proxy_pass);
+ }
+ QNetworkProxy::setApplicationProxy(proxy);
+}