diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-11-14 10:43:37 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-11-14 10:43:37 -0800 |
| commit | 3453234a3b940fbc9703dd3bdb9e89561c2cd92c (patch) | |
| tree | 0a12b1623f830aae40b4e96d7b51f5a23b520294 /subsurface-core | |
| parent | b688f417de4ea246c4e7387232f9b9b8ca9b5318 (diff) | |
| download | subsurface-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')
| -rw-r--r-- | subsurface-core/qt-gui.h | 1 | ||||
| -rw-r--r-- | subsurface-core/qthelper.cpp | 13 | ||||
| -rw-r--r-- | subsurface-core/qthelper.h | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/subsurface-core/qt-gui.h b/subsurface-core/qt-gui.h index bb381d1d3..ca038b145 100644 --- a/subsurface-core/qt-gui.h +++ b/subsurface-core/qt-gui.h @@ -5,7 +5,6 @@ void init_qt_late(); void init_ui(); -void init_proxy(); void run_ui(); void exit_ui(); 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); +} diff --git a/subsurface-core/qthelper.h b/subsurface-core/qthelper.h index a2b7b6c39..5fbc6dbe4 100644 --- a/subsurface-core/qthelper.h +++ b/subsurface-core/qthelper.h @@ -131,5 +131,6 @@ QByteArray getCurrentAppState(); void setCurrentAppState(QByteArray state); extern "C" bool in_planner(); extern "C" void subsurface_mkdir(const char *dir); +void init_proxy(); #endif // QTHELPER_H |