summaryrefslogtreecommitdiffstats
path: root/modules/libpref/Preferences.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2020-01-18 13:17:41 -0500
committerMatt A. Tobin <email@mattatobin.com>2020-01-18 13:17:41 -0500
commitc137a4045cbfcbd5a39f018b553089e0fd571d2c (patch)
treec72233c780f56fa4d53adc0a90f9bcb974120833 /modules/libpref/Preferences.cpp
parent63219a15b155aee142f316156b6578f027204129 (diff)
downloadUXP-c137a4045cbfcbd5a39f018b553089e0fd571d2c.tar
UXP-c137a4045cbfcbd5a39f018b553089e0fd571d2c.tar.gz
UXP-c137a4045cbfcbd5a39f018b553089e0fd571d2c.tar.lz
UXP-c137a4045cbfcbd5a39f018b553089e0fd571d2c.tar.xz
UXP-c137a4045cbfcbd5a39f018b553089e0fd571d2c.zip
Issue #1359 - Pointlessly rename greprefs.. again.
Diffstat (limited to 'modules/libpref/Preferences.cpp')
-rw-r--r--modules/libpref/Preferences.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
index 19487704f..840406635 100644
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -1229,10 +1229,10 @@ static nsresult pref_InitInitialObjects()
nsresult rv;
// In omni.jar case, we load the following prefs:
- // - jar:$gre/omni.jar!/greprefs.js
+ // - jar:$gre/omni.jar!/goanna.js
// - jar:$gre/omni.jar!/defaults/pref/*.js
// In non omni.jar case, we load:
- // - $gre/greprefs.js
+ // - $gre/goanna.js
//
// In both cases, we also load:
// - $gre/defaults/pref/*.js
@@ -1259,8 +1259,8 @@ static nsresult pref_InitInitialObjects()
RefPtr<nsZipArchive> jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE);
if (jarReader) {
- // Load jar:$gre/omni.jar!/greprefs.js
- rv = pref_ReadPrefFromJar(jarReader, "greprefs.js");
+ // Load jar:$gre/omni.jar!/goanna.js
+ rv = pref_ReadPrefFromJar(jarReader, "goanna.js");
NS_ENSURE_SUCCESS(rv, rv);
// Load jar:$gre/omni.jar!/defaults/pref/*.js
@@ -1279,12 +1279,12 @@ static nsresult pref_InitInitialObjects()
NS_WARNING("Error parsing preferences.");
}
} else {
- // Load $gre/greprefs.js
+ // Load $gre/goanna.js
nsCOMPtr<nsIFile> greprefsFile;
rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile));
NS_ENSURE_SUCCESS(rv, rv);
- rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js"));
+ rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("goanna.js"));
NS_ENSURE_SUCCESS(rv, rv);
rv = openPrefFile(greprefsFile);