From 5a31739e6ecb78bf444178f1512fc1fbe3c8dec3 Mon Sep 17 00:00:00 2001
From: Dawit Alemayehu <adawit@kde.org>
Date: Fri, 13 Jan 2012 01:13:27 -0500
Subject: [PATCH] Make sure the "Auto Detect" button is enabled when the "Use
 system proxy configuration" is selected.

Make sure users can simply click the Apply button after selecting the same
option under windows.

CCBUG: 291259
(cherry picked from commit a52df46f43ecc3e5c893aaea7b981ec7c4ca4e46)
---
 konqueror/settings/kio/kproxydlg.cpp | 3 ++-
 konqueror/settings/kio/kproxydlg.ui  | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/konqueror/settings/kio/kproxydlg.cpp b/konqueror/settings/kio/kproxydlg.cpp
index a9c5a23785..38dd9059e2 100644
--- a/konqueror/settings/kio/kproxydlg.cpp
+++ b/konqueror/settings/kio/kproxydlg.cpp
@@ -219,7 +219,7 @@ static void setProxyInformation(const QString& value,
         } else {
             manEdit->setText(urlStr);
         }
-        
+
         if (spinBox && portNum > -1) {
             spinBox->setValue(portNum);
         }
@@ -252,6 +252,7 @@ KProxyDialog::KProxyDialog(QWidget* parent, const QVariantList& args)
     connect(mUi.systemProxyRadioButton, SIGNAL(toggled(bool)), mUi.systemProxyGroupBox, SLOT(setVisible(bool)));
 #else
     mUi.autoDetectButton->setVisible(false);
+    connect(mUi.systemProxyRadioButton, SIGNAL(clicked()), SLOT(slotChanged()));
 #endif
 
     // signals and slots connections
diff --git a/konqueror/settings/kio/kproxydlg.ui b/konqueror/settings/kio/kproxydlg.ui
index 22084895dd..56dc7d206b 100644
--- a/konqueror/settings/kio/kproxydlg.ui
+++ b/konqueror/settings/kio/kproxydlg.ui
@@ -123,9 +123,6 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
    </item>
    <item row="4" column="3">
     <widget class="QPushButton" name="autoDetectButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
      <property name="whatsThis">
       <string>&lt;qt&gt;Attempt automatic discovery of the environment variables used for setting system wide proxy information.&lt;p&gt; This feature works by searching for commonly used variable names such as HTTP_PROXY, FTP_PROXY and NO_PROXY.&lt;/qt&gt;</string>
      </property>