fix after patch for bug 1684948

comm-central/patches/TOP-1611647-1-rename-xul-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1593614763 14400
-#      Wed Jul 01 10:46:03 2020 -0400
-# Node ID ea045144bc58ff255ec0cab5158f1ec9412b3c17
-# Parent  916893ba2d1a5618531af027d91dcda04c8eebd7
+# Date 1611747974 18000
+#      Wed Jan 27 06:46:14 2021 -0500
+# Node ID aafbdda5d7b2b1122682ae57e07aff5dfdb51d8c
+# Parent  ecab3831130b3bd09ac67181d999039d0623349e
 Bug 1611647 - Port bug 1579952 - Mass rename .xul files to .xhtml in suite.
 
 diff --git a/suite/base/content/aboutPrivateBrowsing.xul b/suite/base/content/aboutPrivateBrowsing.xhtml
@@ -231,6 +231,9 @@ rename to suite/components/pref/content/pref-content.xhtml
 diff --git a/suite/components/pref/content/pref-cookies.xul b/suite/components/pref/content/pref-cookies.xhtml
 rename from suite/components/pref/content/pref-cookies.xul
 rename to suite/components/pref/content/pref-cookies.xhtml
+diff --git a/suite/components/pref/content/pref-debugging.xul b/suite/components/pref/content/pref-debugging.xhtml
+rename from suite/components/pref/content/pref-debugging.xul
+rename to suite/components/pref/content/pref-debugging.xhtml
 diff --git a/suite/components/pref/content/pref-download.xul b/suite/components/pref/content/pref-download.xhtml
 rename from suite/components/pref/content/pref-download.xul
 rename to suite/components/pref/content/pref-download.xhtml

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 1597135583 14400
-#      Tue Aug 11 04:46:23 2020 -0400
-# Node ID 5b709a026b5ed01b16e1b174a8edaf8e50220c27
-# Parent  563c53cf65cbe9fb97ab1c69589478c825c3703c
+# Date 1611747982 18000
+#      Wed Jan 27 06:46:22 2021 -0500
+# Node ID 43ed533272bc55c513b6f0c1a7c6916be730de5a
+# Parent  aafbdda5d7b2b1122682ae57e07aff5dfdb51d8c
 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
@@ -1570,6 +1570,25 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
  // Constructor
  function SuiteGlue() {
    XPCOMUtils.defineLazyServiceGetter(this, "_idleService",
+@@ -193,17 +193,17 @@ SuiteGlue.prototype = {
+          // the UI has gone should be finalized in _onQuitApplicationGranted.
+         this._dispose();
+         break;
+       case "profile-after-change":
+         this._onProfileAfterChange();
+         break;
+       case "chrome-document-global-created":
+         // Set up lwt, but only if the "lightweightthemes" attr is set on the root
+-        // (i.e. in messenger.xul).
++        // (i.e. in messenger.xhtml).
+         subject.addEventListener("DOMContentLoaded", () => {
+           if (subject.document.documentElement.hasAttribute("lightweightthemes")) {
+             new LightweightThemeConsumer(subject.document);
+           }
+         }, {once: true});
+         break;
+       case "final-ui-startup":
+         this._onProfileStartup();
 @@ -386,17 +386,17 @@ SuiteGlue.prototype = {
      }
    },
@@ -3169,6 +3188,28 @@ diff --git a/suite/components/tests/chrome/test_idcheck.xhtml b/suite/components
  
        // run test
        for (var uri in uriList)
+diff --git a/suite/editor/base/content/ComposerCommands.js b/suite/editor/base/content/ComposerCommands.js
+--- a/suite/editor/base/content/ComposerCommands.js
++++ b/suite/editor/base/content/ComposerCommands.js
+@@ -1777,17 +1777,17 @@ const kSupportedTextMimeTypes = [
+   "text/rdf",
+   "text/xsl",
+   "text/javascript",
+   "text/ecmascript",
+   "application/javascript",
+   "application/ecmascript",
+   "application/x-javascript",
+   "text/xul",
+-  "application/vnd.mozilla.xul+xml",
++  "application/vnd.mozilla.xhtml+xml",
+ ];
+ 
+ function IsSupportedTextMimeType(aMimeType) {
+   for (var i = 0; i < kSupportedTextMimeTypes.length; i++) {
+     if (kSupportedTextMimeTypes[i] == aMimeType) {
+       return true;
+     }
+   }
 diff --git a/suite/extensions/debugQA/content/debugQAEditorOverlay.js b/suite/extensions/debugQA/content/debugQAEditorOverlay.js
 --- a/suite/extensions/debugQA/content/debugQAEditorOverlay.js
 +++ b/suite/extensions/debugQA/content/debugQAEditorOverlay.js
@@ -3364,6 +3405,24 @@ diff --git a/suite/locales/en-US/chrome/common/pref/pref-colors.dtd b/suite/loca
  <!ENTITY textColor.accesskey               "T">
  <!ENTITY backgroundColor.label             "Background:">
  <!ENTITY backgroundColor.accesskey         "B">
+diff --git a/suite/locales/en-US/chrome/common/pref/pref-debugging.dtd b/suite/locales/en-US/chrome/common/pref/pref-debugging.dtd
+--- a/suite/locales/en-US/chrome/common/pref/pref-debugging.dtd
++++ b/suite/locales/en-US/chrome/common/pref/pref-debugging.dtd
+@@ -1,13 +1,13 @@
+ <!-- This Source Code Form is subject to the terms of the Mozilla Public
+    - License, v. 2.0. If a copy of the MPL was not distributed with this
+    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ 
+-<!-- extracted from pref-eventdebugging.xul -->
++<!-- extracted from pref-eventdebugging.xhtml -->
+ 
+ <!ENTITY pref.debugging.title "Debugging">
+ 
+ <!-- Render Debugging -->
+ <!ENTITY debugRendering.label             "Rendering">
+ <!ENTITY debugXULBox.label                "Debug XUL boxes">
+ <!ENTITY debugXULBox.accesskey            "X">
+ <!ENTITY debugDisableXULCache.label       "Disable XUL Cache">
 diff --git a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
 --- a/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd
 +++ b/suite/locales/en-US/chrome/common/pref/pref-fonts.dtd