Bug 445136 – Autoconfig files should be looked up in GRE directory, not App directory. r=bsmedberg
--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -279,20 +279,23 @@ nsresult nsReadConfig::openAndEvaluateJS
getter_AddRefs(jsFile));
if (NS_FAILED(rv))
return rv;
#ifdef XP_MAC
jsFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
#endif
} else {
- rv = NS_GetSpecialDirectory(NS_APP_DEFAULTS_50_DIR,
+ rv = NS_GetSpecialDirectory(NS_GRE_DIR,
getter_AddRefs(jsFile));
if (NS_FAILED(rv))
return rv;
+ rv = jsFile->AppendNative(NS_LITERAL_CSTRING("defaults"));
+ if (NS_FAILED(rv))
+ return rv;
rv = jsFile->AppendNative(NS_LITERAL_CSTRING("autoconfig"));
if (NS_FAILED(rv))
return rv;
}
rv = jsFile->AppendNative(nsDependentCString(aFileName));
if (NS_FAILED(rv))
return rv;