Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix MCD with better fix for bug 216751, sr=mscott, look at correct pref branch for prefs set in .cfg file

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@219229 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com
2007-01-31 05:16:56 +00:00
parent a09636f4b4
commit a3d3ff410c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/extensions/pref/autoconfig/src/nsReadConfig.cpp
View File

@@ -159,20 +159,20 @@ nsresult nsReadConfig::readConfigFile()
nsXPIDLCString lockVendor;
PRUint32 fileNameLen = 0;
nsCOMPtr<nsIPrefBranch> prefBranch;
nsCOMPtr<nsIPrefBranch> defaultPrefBranch;
nsCOMPtr<nsIPrefService> 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<nsIPrefBranch> 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))