summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/rbsettings.cpp2
-rw-r--r--rbutil/rbutilqt/utils.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/rbsettings.cpp b/rbutil/rbutilqt/rbsettings.cpp
index 8b2569c365..7f4864f515 100644
--- a/rbutil/rbutilqt/rbsettings.cpp
+++ b/rbutil/rbutilqt/rbsettings.cpp
@@ -160,7 +160,7 @@ bool RbSettings::cacheDisabled()
160 160
161QString RbSettings::proxyType() 161QString RbSettings::proxyType()
162{ 162{
163 return userSettings->value("proxytype", "system").toString(); 163 return userSettings->value("proxytype", "none").toString();
164} 164}
165 165
166QString RbSettings::proxy() 166QString RbSettings::proxy()
diff --git a/rbutil/rbutilqt/utils.cpp b/rbutil/rbutilqt/utils.cpp
index 529298530e..27314a8ef2 100644
--- a/rbutil/rbutilqt/utils.cpp
+++ b/rbutil/rbutilqt/utils.cpp
@@ -57,8 +57,7 @@ QUrl systemProxy(void)
57{ 57{
58#if defined(Q_OS_LINUX) 58#if defined(Q_OS_LINUX)
59 return QUrl(getenv("http_proxy")); 59 return QUrl(getenv("http_proxy"));
60#endif 60#elseif defined(Q_OS_WIN32)
61#if defined(Q_OS_WIN32)
62 HKEY hk; 61 HKEY hk;
63 wchar_t proxyval[80]; 62 wchar_t proxyval[80];
64 DWORD buflen = 80; 63 DWORD buflen = 80;
@@ -84,5 +83,7 @@ QUrl systemProxy(void)
84 return QUrl("http://" + QString::fromWCharArray(proxyval)); 83 return QUrl("http://" + QString::fromWCharArray(proxyval));
85 else 84 else
86 return QUrl(""); 85 return QUrl("");
86#else
87 return QUrl("");
87#endif 88#endif
88} 89}