From a3d3ff410cd9885426b49100c19f870d99ed0e52 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Wed, 31 Jan 2007 05:16:56 +0000 Subject: [PATCH] fix MCD with better fix for bug 216751, sr=mscott, look at correct pref branch for prefs set in .cfg file git-svn-id: svn://10.0.0.236/trunk@219229 18797224-902f-48f8-a5cc-f745e15eee43 --- .../extensions/pref/autoconfig/src/nsReadConfig.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp b/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp index e2bf744cb04..f4ee045af88 100644 --- a/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp +++ b/mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp @@ -159,20 +159,20 @@ nsresult nsReadConfig::readConfigFile() nsXPIDLCString lockVendor; PRUint32 fileNameLen = 0; - nsCOMPtr prefBranch; + nsCOMPtr defaultPrefBranch; nsCOMPtr prefService = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); if (NS_FAILED(rv)) return rv; - rv = prefService->GetDefaultBranch(nsnull, getter_AddRefs(prefBranch)); + rv = prefService->GetDefaultBranch(nsnull, getter_AddRefs(defaultPrefBranch)); if (NS_FAILED(rv)) return rv; // This preference is set in the all.js or all-ns.js (depending whether // running mozilla or netscp6) - rv = prefBranch->GetCharPref("general.config.filename", + rv = defaultPrefBranch->GetCharPref("general.config.filename", getter_Copies(lockFileName)); @@ -209,8 +209,12 @@ nsresult nsReadConfig::readConfigFile() // file we allow for the preference to be set (and locked) by the creator // of the cfg file meaning the file can not be renamed (successfully). + nsCOMPtr prefBranch; + rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch)); + NS_ENSURE_SUCCESS(rv, rv); + PRInt32 obscureValue = 0; - (void) prefBranch->GetIntPref("general.config.obscure_value", &obscureValue); + (void) defaultPrefBranch->GetIntPref("general.config.obscure_value", &obscureValue); PR_LOG(MCD, PR_LOG_DEBUG, ("evaluating .cfg file %s with obscureValue %d\n", lockFileName.get(), obscureValue)); rv = openAndEvaluateJSFile(lockFileName.get(), PR_TRUE, obscureValue, PR_TRUE); if (NS_FAILED(rv))