Rebase after pushes

comm-central/patches/9999999-port1728240-suite-93a1.patch

@@ -1,27 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1630497235 0
-Bug 9999999 - port bug 1728240 ro suite.
-
-diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
---- a/suite/installer/package-manifest.in
-+++ b/suite/installer/package-manifest.in
-@@ -210,18 +210,16 @@
- @RESPATH@/components/extensions-toolkit.manifest
- 
- ; [Browser Chrome Files]
- ; Browser: Hack to get built_in_addons.json packaged
- @RESPATH@/chrome/browser@JAREXT@
- @RESPATH@/chrome/browser.manifest
- @RESPATH@/chrome/comm@JAREXT@
- @RESPATH@/chrome/comm.manifest
--@RESPATH@/chrome/recording.manifest
--@RESPATH@/chrome/recording/*
- @RESPATH@/chrome/toolkit@JAREXT@
- @RESPATH@/chrome/toolkit.manifest
- 
- ; [DevTools Startup Files]
- @RESPATH@/chrome/devtools-startup@JAREXT@
- @RESPATH@/chrome/devtools-startup.manifest
- 
- ; DevTools

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

@@ -3,7 +3,7 @@
 # Date 1626813122 14400
 #      Tue Jul 20 16:32:02 2021 -0400
 # Node ID 1de38ba2521de8b67e9c4a651c27bccd08770286
-# Parent  ca5b22d10867a301da71ab799eddb29e073dfba5
+# Parent  31a1e73d21cdcd3d7e10072baf1227f325112fcf
 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
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
  pref("general.startup.mail",                false);
  pref("general.startup.news",                false);
  pref("general.startup.editor",              false);
-@@ -738,18 +738,18 @@ pref("privacy.clearOnShutdown.siteSettin
+@@ -739,18 +739,18 @@ pref("privacy.clearOnShutdown.siteSettin
  pref("privacy.warn_tracking_content", true);
  
  // Switching this on will also spoof our user agent and other potentially
@@ -328,7 +328,7 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
      }
      else if (buttonID == "getMeOutOfHereButton") {
        // Redirect them to a known-functioning page, default start page
-@@ -1776,17 +1776,17 @@ function subscribeToFeedMiddleClick(href
+@@ -1786,17 +1786,17 @@ function subscribeToFeedMiddleClick(href
  }
  
  function OpenSearchEngineManager() {
@@ -1135,9 +1135,9 @@ diff --git a/suite/chatzilla/jar.mn b/suite/chatzilla/jar.mn
  	content/chatzilla/lib/js/message-manager.js  (js/lib/message-manager.js)
  	content/chatzilla/lib/js/menu-manager.js     (js/lib/menu-manager.js)
  	content/chatzilla/lib/js/ident.js            (js/lib/ident.js) 
-@@ -26,52 +26,52 @@ chatzilla.jar:
- 	content/chatzilla/lib/js/dcc.js              (js/lib/dcc.js) 
+@@ -27,52 +27,52 @@ chatzilla.jar:
  	content/chatzilla/lib/js/json-serializer.js  (js/lib/json-serializer.js)
+ 	content/chatzilla/lib/js/sts.js              (js/lib/sts.js)
  	content/chatzilla/lib/js/text-serializer.js  (js/lib/text-serializer.js)
  	content/chatzilla/lib/js/text-logger.js      (js/lib/text-logger.js)
  	content/chatzilla/lib/js/chatzilla-protocol-script.js (js/lib/chatzilla-protocol-script.js)
@@ -1308,7 +1308,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
-@@ -2273,17 +2273,17 @@ function cmdJoin(e)
+@@ -2233,17 +2233,17 @@ function cmdJoin(e)
      {
          if (client.joinDialog)
          {
@@ -1327,7 +1327,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
  
      var chan;
      if (!e.channelToJoin)
-@@ -2626,17 +2626,17 @@ function cmdTopic(e)
+@@ -2587,17 +2587,17 @@ function cmdTopic(e)
  
  function cmdAbout(e)
  {
@@ -1346,7 +1346,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);
-@@ -3697,17 +3697,17 @@ function cmdDoCommand(e)
+@@ -3673,17 +3673,17 @@ function cmdDoCommand(e)
          // Open SeaMonkey preferences.
          goPreferences("navigator_pane");
      }
@@ -1365,7 +1365,7 @@ diff --git a/suite/chatzilla/xul/content/commands.js b/suite/chatzilla/xul/conte
          }
      }
      else if (e.cmdName == "cmd_selectAll")
-@@ -4397,17 +4397,17 @@ function cmdInputTextDirection(e)
+@@ -4385,17 +4385,17 @@ function cmdInputTextDirection(e)
              client.input.setAttribute("dir", "ltr");
      }
  
@@ -1387,7 +1387,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
-@@ -1567,17 +1567,17 @@ function pwin_onAddObject()
+@@ -1568,17 +1568,17 @@ function pwin_onAddObject()
          case "PrefUser":
              rv.type = "user";
              rv.net = this.currentObject.parent.parent.parent.unicodeName;
@@ -1409,7 +1409,7 @@ diff --git a/suite/chatzilla/xul/content/config.js b/suite/chatzilla/xul/content
 diff --git a/suite/chatzilla/xul/content/networks-edit.js b/suite/chatzilla/xul/content/networks-edit.js
 --- a/suite/chatzilla/xul/content/networks-edit.js
 +++ b/suite/chatzilla/xul/content/networks-edit.js
-@@ -312,17 +312,17 @@ var gNetworkWindow = {
+@@ -313,17 +313,17 @@ var gNetworkWindow = {
      let id;
      let server;
      if (aItem) {

comm-central/patches/series

@@ -1,6 +1,5 @@
 9999999-port1712633-suite-90a1.patch
 9999999-port1646560-suite-91a1.patch
-9999999-port1728240-suite-93a1.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch