diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-04-01 03:14:50 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-01 03:14:50 -0500 |
| commit | 0231f7464fb13eb146a2d4f77f23d75c52a589e1 (patch) | |
| tree | 3845a01934f5883395df266990c7769846bf2d47 /components | |
| parent | c3dc8a1f81c2148a64bc99a194da4c10614e9b95 (diff) | |
| download | aura-central-0231f7464fb13eb146a2d4f77f23d75c52a589e1.tar.gz | |
Move BinOC Apps to apps/ and make navigator build .. also use a bash script for mach and chain to real-mach
Diffstat (limited to 'components')
| -rw-r--r-- | components/preferences/src/Preferences.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/preferences/src/Preferences.cpp b/components/preferences/src/Preferences.cpp index 5f17125da..51cc6a1cf 100644 --- a/components/preferences/src/Preferences.cpp +++ b/components/preferences/src/Preferences.cpp @@ -1220,10 +1220,10 @@ static nsresult pref_InitInitialObjects() nsresult rv; // In omni.jar case, we load the following prefs: - // - jar:$gre/omni.jar!/goanna.js + // - jar:$gre/omni.jar!/platform-prefs.js // - jar:$gre/omni.jar!/defaults/pref/*.js // In non omni.jar case, we load: - // - $gre/goanna.js + // - $gre/platform-prefs.js // // In both cases, we also load: // - $gre/defaults/pref/*.js @@ -1250,8 +1250,8 @@ static nsresult pref_InitInitialObjects() RefPtr<nsZipArchive> jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE); if (jarReader) { - // Load jar:$gre/omni.jar!/goanna.js - rv = pref_ReadPrefFromJar(jarReader, "goanna.js"); + // Load jar:$gre/omni.jar!/platform-prefs.js + rv = pref_ReadPrefFromJar(jarReader, "platform-prefs.js"); NS_ENSURE_SUCCESS(rv, rv); // Load jar:$gre/omni.jar!/defaults/pref/*.js @@ -1270,12 +1270,12 @@ static nsresult pref_InitInitialObjects() NS_WARNING("Error parsing preferences."); } } else { - // Load $gre/goanna.js + // Load $gre/platform-prefs.js nsCOMPtr<nsIFile> greprefsFile; rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile)); NS_ENSURE_SUCCESS(rv, rv); - rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("goanna.js")); + rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("platform-prefs.js")); NS_ENSURE_SUCCESS(rv, rv); rv = openPrefFile(greprefsFile); |