rebase after pushes

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

@@ -3,7 +3,7 @@
 # Date 1633169929 14400
 #      Sat Oct 02 06:18:49 2021 -0400
 # Node ID 9151e19098171a996ebd78cc1ea551a3e7de91ff
-# Parent  3cd0b356afcb04d39420b4d71921358ab69b5550
+# Parent  e7d251da9ef76d683d74681be56bbd63b4a0b07d
 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
@@ -437,7 +437,7 @@ diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoom
 diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 --- a/suite/base/jar.mn
 +++ b/suite/base/jar.mn
-@@ -4,92 +4,92 @@
+@@ -4,93 +4,93 @@
  # 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/.comm.jar:
  
@@ -525,6 +525,8 @@ diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 +% overlay chrome://messenger-smime/content/msgCompSecurityInfo.xhtml chrome://communicator/content/helpMessengerOverlay.xhtml
 +% overlay chrome://messenger-smime/content/msgReadSecurityInfo.xhtml chrome://communicator/content/helpMessengerOverlay.xhtml
  % style about:addons chrome://communicator/content/extensionsOverlay.css
+-% style chrome://mozapps/content/extensions/extensions.xul chrome://communicator/content/extensionsOverlay.css
++% style chrome://mozapps/content/extensions/extensions.xhtml chrome://communicator/content/extensionsOverlay.css
     content/communicator/about.js                                    (content/about.js)
     content/communicator/about.xhtml                                 (content/about.xhtml)
     content/communicator/aboutLife.xhtml                             (content/aboutLife.xhtml)
@@ -1270,7 +1272,7 @@ diff --git a/suite/chatzilla/xul/content/chatzillaOverlay.js b/suite/chatzilla/x
 diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/content/commands.js
 --- a/suite/chatzilla/xul/content/commands.js
 +++ b/suite/chatzilla/xul/content/commands.js
-@@ -1470,17 +1470,17 @@ function cmdNetworks(e)
+@@ -1473,17 +1473,17 @@ function cmdNetworks(e)
  
      wrapper.appendChild(spanb);
      display(wrapper, MT_INFO);
@@ -1289,7 +1291,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
      let scheme = (e.command.name == "sslserver") ? "ircs" : "irc";
  
      var ary = e.hostname.match(/^(.*):(\d+)$/);
-@@ -1497,17 +1497,17 @@ function cmdServer(e)
+@@ -1500,17 +1500,17 @@ function cmdServer(e)
  }
  
  function cmdSSLException(e)
@@ -1308,7 +1310,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
      if (e.connect)
      {
          // When we come via the inline button, we just want to reconnect
-@@ -2398,17 +2398,17 @@ function cmdJoin(e)
+@@ -2402,17 +2402,17 @@ function cmdJoin(e)
      {
          if (client.joinDialog)
          {
@@ -1327,7 +1329,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
  
      var chan;
      if (!e.channelToJoin)
-@@ -2752,17 +2752,17 @@ function cmdTopic(e)
+@@ -2790,17 +2790,17 @@ function cmdTopic(e)
  
  function cmdAbout(e)
  {
@@ -1346,7 +1348,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
          client.munger.getRule(".inline-buttons").enabled = true;
          display(getMsg(MSG_ABOUT_VERSION, [ver, "about"]));
          display(MSG_ABOUT_HOMEPAGE);
-@@ -3838,17 +3838,17 @@ function cmdDoCommand(e)
+@@ -3876,17 +3876,17 @@ function cmdDoCommand(e)
          // Open SeaMonkey preferences.
          goPreferences("navigator_pane");
      }
@@ -1365,7 +1367,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
          }
      }
      else if (e.cmdName == "cmd_selectAll")
-@@ -4550,17 +4550,17 @@ function cmdInputTextDirection(e)
+@@ -4588,17 +4588,17 @@ function cmdInputTextDirection(e)
              client.input.setAttribute("dir", "ltr");
      }
  
@@ -1387,7 +1389,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
 diff --git a/suite/chatzilla/xul/content/config.js b/suite/chatzilla/xul/content/config.js
 --- a/suite/chatzilla/xul/content/config.js
 +++ b/suite/chatzilla/xul/content/config.js
-@@ -1568,17 +1568,17 @@ function pwin_onAddObject()
+@@ -1572,17 +1572,17 @@ function pwin_onAddObject()
          case "PrefUser":
              rv.type = "user";
              rv.net = this.currentObject.parent.parent.parent.unicodeName;