diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-01-18 13:17:41 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-01-18 13:17:41 -0500 |
| commit | aa08ced0d9762433ea61e4587aa70dafd4377c66 (patch) | |
| tree | c72233c780f56fa4d53adc0a90f9bcb974120833 /modules | |
| parent | efbcbf5964596576a0a111666f7153c90be80e78 (diff) | |
| download | uxp-aa08ced0d9762433ea61e4587aa70dafd4377c66.tar.gz | |
Issue mcp-graveyard/UXP#1359 - Pointlessly rename greprefs.. again.
Diffstat (limited to 'modules')
| -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 |
3 files changed, 7 insertions, 9 deletions
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp index 19487704f5..840406635a 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 d59110b6a6..d59110b6a6 100644 --- a/modules/libpref/greprefs.js +++ b/modules/libpref/goanna.js diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build index 1c2c13e69a..1c9a51650b 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'] |