From kde-core-devel  Thu Feb 17 03:46:28 2005
From: "Dawit A." <adawit () kde ! org>
Date: Thu, 17 Feb 2005 03:46:28 +0000
To: kde-core-devel
Subject: PATCH: Bug# 98876
Message-Id: <200502162246.28981.adawit () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-core-devel&m=110861201732080
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_UOBFCdRxMIwIYv7"

--Boundary-00=_UOBFCdRxMIwIYv7
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


The following kprotocolmanager.cpp patch fixes BR # 98876...

-- 
Regards,
Dawit A.
"Preach what you practice, practice what you preach"

--Boundary-00=_UOBFCdRxMIwIYv7
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="kprotocolmanager-20050216.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="kprotocolmanager-20050216.diff"

Index: kprotocolmanager.cpp
===================================================================
RCS file: /home/kde/kdelibs/kio/kio/kprotocolmanager.cpp,v
retrieving revision 1.140
diff -u -p -b -B -r1.140 kprotocolmanager.cpp
--- kprotocolmanager.cpp	30 Nov 2004 08:02:00 -0000	1.140
+++ kprotocolmanager.cpp	17 Feb 2005 03:43:20 -0000
@@ -206,11 +206,16 @@ int KProtocolManager::maxCacheSize()
 
 QString KProtocolManager::noProxyFor()
 {
+  int type = proxyType();
+
+  if ( type != ManualProxy || type != EnvVarProxy )
+    return QString::null;
+
   KConfig *cfg = config();
   cfg->setGroup( "Proxy Settings" );
 
   QString noProxy = cfg->readEntry( "NoProxyFor" );
-  if (proxyType() == EnvVarProxy)
+  if (type == EnvVarProxy)
     noProxy = QString::fromLocal8Bit(getenv(noProxy.local8Bit()));
 
   return noProxy;

--Boundary-00=_UOBFCdRxMIwIYv7--