From 8b1c25e608e7255199dc97ad8269ac66d40beede Mon Sep 17 00:00:00 2001
From: andyq <andyq>
Date: Fri, 13 Dec 2002 13:49:02 +0000
Subject: Only enable the username and password if one of the proxies is enabled

---
(limited to 'noncore')

diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 3933a22..0159a79 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -250,11 +250,11 @@ void DataManager :: writeOutIpkgConf()
             out << "#";
         out << "option ftp_proxy " << ftpProxy << endl;
     }
-    if ( proxyUsername == "" )
+    if ( proxyUsername == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
         out << "#option proxy_username <username>" << endl;
     else
         out << "option proxy_username " << proxyUsername << endl;
-    if ( proxyPassword == "" )
+    if ( proxyPassword == "" || (!httpProxyEnabled && !ftpProxyEnabled) )
         out << "#option proxy_password <password>" << endl << endl;
     else
         out << "option proxy_password " << proxyPassword << endl<< endl;
--
cgit v0.9.0.2