From c137a4045cbfcbd5a39f018b553089e0fd571d2c Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 18 Jan 2020 13:17:41 -0500
Subject: Issue #1359 - Pointlessly rename greprefs.. again.

---
 modules/libpref/Preferences.cpp | 12 ++++++------
 modules/libpref/goanna.js       | 12 ++++++++++++
 modules/libpref/greprefs.js     | 12 ------------
 modules/libpref/moz.build       |  4 +---
 4 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 modules/libpref/goanna.js
 delete mode 100644 modules/libpref/greprefs.js

(limited to 'modules/libpref')

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/goanna.js b/modules/libpref/goanna.js
new file mode 100644
index 000000000..d59110b6a
--- /dev/null
+++ b/modules/libpref/goanna.js
@@ -0,0 +1,12 @@
+#include ../../netwerk/base/security-prefs.js
+#include init/all.js
+#ifdef MOZ_DATA_REPORTING
+#include ../../toolkit/components/telemetry/datareporting-prefs.js
+#endif
+#ifdef MOZ_SERVICES_HEALTHREPORT
+#if MOZ_WIDGET_TOOLKIT == android
+#include ../../mobile/android/chrome/content/healthreport-prefs.js
+#else
+#include ../../toolkit/components/telemetry/healthreport-prefs.js
+#endif
+#endif
diff --git a/modules/libpref/greprefs.js b/modules/libpref/greprefs.js
deleted file mode 100644
index d59110b6a..000000000
--- a/modules/libpref/greprefs.js
+++ /dev/null
@@ -1,12 +0,0 @@
-#include ../../netwerk/base/security-prefs.js
-#include init/all.js
-#ifdef MOZ_DATA_REPORTING
-#include ../../toolkit/components/telemetry/datareporting-prefs.js
-#endif
-#ifdef MOZ_SERVICES_HEALTHREPORT
-#if MOZ_WIDGET_TOOLKIT == android
-#include ../../mobile/android/chrome/content/healthreport-prefs.js
-#else
-#include ../../toolkit/components/telemetry/healthreport-prefs.js
-#endif
-#endif
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']
-- 
cgit v1.2.3