diff options
| -rw-r--r-- | modules/libpref/Preferences.cpp | 12 | ||||
| -rw-r--r-- | modules/libpref/goanna.js (renamed from modules/libpref/greprefs.js) | 0 | ||||
| -rw-r--r-- | modules/libpref/moz.build | 4 | ||||
| -rw-r--r-- | python/mozbuild/mozpack/packager/formats.py | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozpack/test/test_packager_formats.py | 4 | ||||
| -rw-r--r-- | toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js | 2 |
6 files changed, 11 insertions, 13 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); diff --git a/modules/libpref/greprefs.js b/modules/libpref/goanna.js index d59110b6a..d59110b6a 100644 --- a/modules/libpref/greprefs.js +++ b/modules/libpref/goanna.js diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build index 1c2c13e69..1c9a51650 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build @@ -43,6 +43,4 @@ FINAL_LIBRARY = 'xul' DEFINES['OS_ARCH'] = CONFIG['OS_ARCH'] DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] -FINAL_TARGET_PP_FILES += [ - 'greprefs.js', -] +FINAL_TARGET_PP_FILES += ['goanna.js'] diff --git a/python/mozbuild/mozpack/packager/formats.py b/python/mozbuild/mozpack/packager/formats.py index c4adabab0..cedd1998b 100644 --- a/python/mozbuild/mozpack/packager/formats.py +++ b/python/mozbuild/mozpack/packager/formats.py @@ -318,7 +318,7 @@ class OmniJarSubFormatter(PiecemealFormatter): path[1] in ['pref', 'preferences']) return path[0] in [ 'modules', - 'greprefs.js', + 'goanna.js', 'hyphenation', 'update.locale', ] or path[0] in STARTUP_CACHE_PATHS diff --git a/python/mozbuild/mozpack/test/test_packager_formats.py b/python/mozbuild/mozpack/test/test_packager_formats.py index 1af4336b2..66a7cc8e6 100644 --- a/python/mozbuild/mozpack/test/test_packager_formats.py +++ b/python/mozbuild/mozpack/test/test_packager_formats.py @@ -405,13 +405,13 @@ class TestFormatters(unittest.TestCase): self.assertFalse( is_resource(base, 'defaults/preferences/channel-prefs.js')) self.assertTrue(is_resource(base, 'modules/foo.jsm')) - self.assertTrue(is_resource(base, 'greprefs.js')) + self.assertTrue(is_resource(base, 'goanna.js')) self.assertTrue(is_resource(base, 'hyphenation/foo')) self.assertTrue(is_resource(base, 'update.locale')) self.assertTrue( is_resource(base, 'jsloader/resource/gre/modules/foo.jsm')) self.assertFalse(is_resource(base, 'foo')) - self.assertFalse(is_resource(base, 'foo/bar/greprefs.js')) + self.assertFalse(is_resource(base, 'foo/bar/goanna.js')) self.assertTrue(is_resource(base, 'defaults/messenger/foo.dat')) self.assertFalse( is_resource(base, 'defaults/messenger/mailViews.dat')) diff --git a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js index ada08f0ae..9a9610dda 100644 --- a/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js +++ b/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js @@ -839,7 +839,7 @@ function setupTestCommon() { if (!grePrefsFile.exists()) { grePrefsFile.create(Ci.nsIFile.DIRECTORY_TYPE, PERMS_DIRECTORY); } - grePrefsFile.append("greprefs.js"); + grePrefsFile.append("goanna.js"); if (!grePrefsFile.exists()) { grePrefsFile.create(Ci.nsILocalFile.NORMAL_FILE_TYPE, PERMS_FILE); } |