1 files changed, 3 insertions, 32 deletions

diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index e74dc6e30d..c155cd230c 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -25,6 +25,7 @@
 #include "browsedirtree.h"
 #include "encoders.h"
 #include "tts.h"
+#include "utils.h"
 
 #include <stdio.h>
 #if defined(Q_OS_WIN32)
@@ -384,40 +385,10 @@ void Config::setSystemProxy(bool checked)
         proxy.setHost(ui.proxyHost->text());
         proxy.setPort(ui.proxyPort->text().toInt());
         // show system values in input box
-        QUrl envproxy;
-#if defined(Q_OS_LINUX)
-        envproxy = QUrl(getenv("http_proxy"));
+        QUrl envproxy = systemProxy();
 
         ui.proxyHost->setText(envproxy.host());
-#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;
-
-        ret = RegQueryValueEx(hk, _TEXT("ProxyServer"), NULL, NULL, (LPBYTE)proxyval, &buflen);
-        if(ret != ERROR_SUCCESS) return;
-
-        ret = RegQueryValueEx(hk, _TEXT("ProxyEnable"), NULL, NULL, (LPBYTE)&enable, &enalen);
-        if(ret != ERROR_SUCCESS) return;
-
-        RegCloseKey(hk);
-        envproxy = QUrl("http://" + QString::fromWCharArray(proxyval));
-        qDebug() << envproxy;
-        if(enable != 0) {
-            ui.proxyHost->setText(envproxy.host());
-        }
-        else {
-            ui.proxyHost->setText(envproxy.host() + " " + tr("(system proxy is disabled)"));
-        }
-#endif
+
         ui.proxyPort->setText(QString("%1").arg(envproxy.port()));
         ui.proxyUser->setText(envproxy.userName());
         ui.proxyPass->setText(envproxy.password());