1 files changed, 3 insertions, 29 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp
index bbba56e2e8..bec87c79b2 100644
--- a/rbutil/rbutilqt/rbutilqt.cpp
+++ b/rbutil/rbutilqt/rbutilqt.cpp
@@ -969,36 +969,10 @@ QUrl RbUtilQt::proxy()
 {
     if(userSettings->value("proxytype", "system").toString() == "manual")
         return QUrl(userSettings->value("proxy").toString());
-#if defined(Q_OS_LINUX)
     else if(userSettings->value("proxytype", "system").toString() == "system")
-        return QUrl(getenv("http_proxy"));
-#endif
-#if defined(Q_OS_WIN32)
-    HKEY hk;
-    wchar_t proxyval[80];
-    DWORD buflen = 80;
-    long ret;
-    DWORD enable;
-    DWORD enalen = sizeof(DWORD);
-
-    ret = RegOpenKeyEx(HKEY_CURRENT_USER,
-        _TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings"),
-        0, KEY_QUERY_VALUE, &hk);
-    if(ret != ERROR_SUCCESS) return QUrl("");
-
-    ret = RegQueryValueEx(hk, _TEXT("ProxyServer"), NULL, NULL, (LPBYTE)proxyval, &buflen);
-    if(ret != ERROR_SUCCESS) return QUrl("");
-    
-    ret = RegQueryValueEx(hk, _TEXT("ProxyEnable"), NULL, NULL, (LPBYTE)&enable, &enalen);
-    if(ret != ERROR_SUCCESS) return QUrl("");
-
-    RegCloseKey(hk);
-
-    qDebug() << QString::fromWCharArray(proxyval) << QString("%1").arg(enable);
-    if(enable != 0)
-        return QUrl("http://" + QString::fromWCharArray(proxyval));
-
-#endif
+    {    
+        systemProxy();
+    }
     return QUrl("");
 }