summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-05-26 14:33:28 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-05-26 14:33:28 +0200
commit6ce525e98335a4ab0225b29a451473bdc3a5ae19 (patch)
tree6bbda2427d6594135ecf3e898a493244306d66ee /src
parentFixing Compilation (diff)
downloadrekonq-6ce525e98335a4ab0225b29a451473bdc3a5ae19.tar.xz
load AccessManager Proxy fix
Diffstat (limited to 'src')
-rw-r--r--src/networkaccessmanager.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index ddab6ffe..d0c9833b 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -77,9 +77,9 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
void NetworkAccessManager::loadSettings()
{
- QNetworkProxy proxy;
if (ReKonfig::isProxyEnabled())
{
+ QNetworkProxy proxy;
if (ReKonfig::proxyType() == 0)
{
proxy.setType(QNetworkProxy::Socks5Proxy);
@@ -92,8 +92,9 @@ void NetworkAccessManager::loadSettings()
proxy.setPort(ReKonfig::proxyPort());
proxy.setUser(ReKonfig::proxyUserName());
proxy.setPassword(ReKonfig::proxyPassword());
+
+ setProxy(proxy);
}
- setProxy(proxy);
}