rebase

comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1697712739 14400
-#      Thu Oct 19 06:52:19 2023 -0400
-# Node ID aa370e119f11ae9c6df0dcd87822ab665f63193e
-# Parent  45168cc70907d2bdc98a39678c68c1213532af75
+# Date 1724955429 14400
+#      Thu Aug 29 14:17:09 2024 -0400
+# Node ID bb6222d4ac453c485dc4c5f691399558e0679230
+# Parent  784f3faef3dd1943f685486a1e5b6ba6c0ba7aab
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 
 diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
@@ -1901,44 +1901,6 @@ diff --git a/suite/components/migration/jar.mn b/suite/components/migration/jar.
 -  content/communicator/migration/migration.xul                     (content/migration.xul)
 +  content/communicator/migration/migration.xhtml                   (content/migration.xhtml)
    content/communicator/migration/migration.js                      (content/migration.js)
-diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
---- a/suite/components/nsAbout.js
-+++ b/suite/components/nsAbout.js
-@@ -13,31 +13,31 @@ function About() { }
- About.prototype = {
-   Flags: SCRIPT,
-   URI: "chrome://communicator/content/about.xhtml",
-   blockedFlags: SCRIPT | UNTRUSTED | HIDE,
-   blockedURI: "chrome://communicator/content/blockedSite.xhtml",
-   certerrorFlags: SCRIPT | UNTRUSTED | HIDE,
-   certerrorURI: "chrome://communicator/content/certError.xhtml",
-   dataFlags: SCRIPT,
--  dataURI: "chrome://communicator/content/dataman/dataman.xul",
-+  dataURI: "chrome://communicator/content/dataman/dataman.xhtml",
-   feedsFlags: SCRIPT | UNTRUSTED | HIDE,
-   feedsURI: "chrome://communicator/content/feeds/subscribe.xhtml",
-   lifeFlags: SCRIPT | UNTRUSTED | HIDE,
-   lifeURI: "chrome://communicator/content/aboutLife.xhtml",
-   newserrorFlags: SCRIPT | HIDE,
-   newserrorURI: "chrome://messenger/content/newsError.xhtml",
-   privatebrowsingFlags: SCRIPT,
--  privatebrowsingURI: "chrome://communicator/content/aboutPrivateBrowsing.xul",
-+  privatebrowsingURI: "chrome://communicator/content/aboutPrivateBrowsing.xhtml",
-   rightsFlags: SCRIPT | UNTRUSTED,
-   rightsURI: "chrome://branding/content/aboutRights.xhtml",
-   sessionrestoreFlags: SCRIPT | HIDE,
-   sessionrestoreURI: "chrome://communicator/content/aboutSessionRestore.xhtml",
-   // synctabsFlags: SCRIPT,
--  // synctabsURI: "chrome://communicator/content/aboutSyncTabs.xul",
-+  // synctabsURI: "chrome://communicator/content/aboutSyncTabs.xhtml",
- 
-   classID: Components.ID("{d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}"),
-   QueryInterface: ChromeUtils.generateQI([Ci.nsIAboutModule]),
- 
-   getModule: function(aURI) {
-     return aURI.pathQueryRef.replace(/-|\W.*$/g, "").toLowerCase();
-   },
- 
 diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
 --- a/suite/components/nsSuiteGlue.js
 +++ b/suite/components/nsSuiteGlue.js
@@ -3026,7 +2988,7 @@ diff --git a/suite/components/profile/jar.mn b/suite/components/profile/jar.mn
 diff --git a/suite/components/sanitize/Sanitizer.jsm b/suite/components/sanitize/Sanitizer.jsm
 --- a/suite/components/sanitize/Sanitizer.jsm
 +++ b/suite/components/sanitize/Sanitizer.jsm
-@@ -86,17 +86,17 @@ var Sanitizer = {
+@@ -87,17 +87,17 @@ var Sanitizer = {
     * @param [optional] parentWindow the window to use as
     *                   parent for the created dialog.
     */