Rebase after patches

comm-central/patches/9999999-suite-extensions.patch

@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1643478801 0
-Bug 9999999 - Fix suite extensions and themes.
-
-Bug 1717683 removed this line:
-
-  check_prog("ZIP", ("zip",))
-
-from toolkit/moz.configure.  This is required for building and packaging on
-suite extensions and themes, so adding it to suite/moz.configure.
-
-diff --git a/suite/moz.configure b/suite/moz.configure
---- a/suite/moz.configure
-+++ b/suite/moz.configure
-@@ -138,10 +138,15 @@ option(
- 
- @depends_if("--enable-debugqa")
- def debugqa(arg):
-     return True
- 
- 
- set_config("MOZ_DEBUGQA", debugqa)
- 
-+# Miscellaneous programs
-+# ==============================================================
-+
-+check_prog("ZIP", ("zip",))
-+
- include("../mailnews/moz.configure")
- include("../../toolkit/moz.configure")

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

@@ -3,7 +3,7 @@
 # Date 1641471337 18000
 #      Thu Jan 06 07:15:37 2022 -0500
 # Node ID b26cee1637d4d447b316f7466fd88cf523119dc4
-# Parent  8d6f5b2f7da23339c8ee67bad4f3e2dac2fb5d5f
+# Parent  1ec396b77afd5897a9a0f216ec3e3a90fecb9585
 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
@@ -2564,28 +2564,6 @@ diff --git a/suite/components/pref/content/pref-proxies.js b/suite/components/pr
    DoProxyHostCopy(gHTTP.value);
    DoProxyPortCopy(gHTTPPort.value);
    var nonshare = ["networkProxySSL", "networkProxySSL_Port",
-diff --git a/suite/components/pref/content/pref-scripts.xhtml b/suite/components/pref/content/pref-scripts.xhtml
---- a/suite/components/pref/content/pref-scripts.xhtml
-+++ b/suite/components/pref/content/pref-scripts.xhtml
-@@ -100,17 +100,17 @@
- 
-     <groupbox id="pluginPreferences">
-       <caption label="&enablePlugins.label;"/>
-       <checkbox id="pluginForSuite"
-                 label="&enablePluginForSuite.label;"
-                 accesskey="&enablePluginForSuite.accesskey;"
-                 preference="plugin.disable"/>
- 
--      <!-- mailnews will add its checkbox here using overlay (mailPrefsOverlay.xul).
-+      <!-- mailnews will add its checkbox here using overlay (mailPrefsOverlay.xhtml).
-       -->
-     </groupbox>
- 
-     <groupbox id="pageRequiresPlugins">
-       <caption label="&whenPageRequiresPlugins.label;"/>
-       <checkbox id="activateAllPlugins"
-                 label="&activateAllPlugins.label;"
-                 accesskey="&activateAllPlugins.accesskey;"
 diff --git a/suite/components/pref/content/pref-sync.js b/suite/components/pref/content/pref-sync.js
 --- a/suite/components/pref/content/pref-sync.js
 +++ b/suite/components/pref/content/pref-sync.js
@@ -4754,7 +4732,7 @@ diff --git a/suite/mailnews/components/compose/jar.mn b/suite/mailnews/component
 diff --git a/suite/mailnews/components/prefs/content/mailPrefsOverlay.xhtml b/suite/mailnews/components/prefs/content/mailPrefsOverlay.xhtml
 --- a/suite/mailnews/components/prefs/content/mailPrefsOverlay.xhtml
 +++ b/suite/mailnews/components/prefs/content/mailPrefsOverlay.xhtml
-@@ -53,66 +53,66 @@
+@@ -37,66 +37,66 @@
  
    <!-- category tree entries for mail/news -->
    <treechildren id="prefsPanelChildren">
@@ -4958,7 +4936,7 @@ diff --git a/suite/mailnews/content/ABSearchDialog.xhtml b/suite/mailnews/conten
 diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content/FilterListDialog.js
 --- a/suite/mailnews/content/FilterListDialog.js
 +++ b/suite/mailnews/content/FilterListDialog.js
-@@ -307,17 +307,17 @@ function onEditFilter()
+@@ -336,17 +336,17 @@ function onEditFilter()
      return;
  
    var selectedFilter = currentFilter();
@@ -4977,7 +4955,7 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
    }
  }
  
-@@ -367,17 +367,17 @@ function calculatePositionAndShowCreateF
+@@ -396,17 +396,17 @@ function calculatePositionAndShowCreateF
          break;
        }
      }
@@ -4996,7 +4974,7 @@ diff --git a/suite/mailnews/content/FilterListDialog.js b/suite/mailnews/content
      // On success: reset the search box if necessary!
      resetSearchBox(args.newFilter);
      rebuildFilterList();
-@@ -530,17 +530,17 @@ function moveFilter(motion) {
+@@ -559,17 +559,17 @@ function moveFilter(motion) {
  
    rebuildFilterList();
  }
@@ -5613,13 +5591,13 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
 +    window.openDialog("chrome://messenger/content/FilterEditor.xhtml", "",
                        "chrome, modal, resizable,centerscreen,dialog", args);
  
-     // args.refresh is set to true in the filterEditor, if the user hits ok.
-     // We check this here in args to show the filterList dialog.
+     // If the user hits ok in the filterEditor dialog we set args.refresh=true
+     // there and we check this here in args to show filterList dialog.
+     // We also received the filter created via args.newFilter.
      if ("refresh" in args && args.refresh) {
-        args = { refresh: true, folder };
+        args = { refresh: true, folder, filter: args.newFilter };
         MsgFilterList(args);
-     }
-@@ -1722,17 +1722,17 @@ function MsgSendUnsentMsgs() {
+@@ -1723,17 +1723,17 @@ function MsgSendUnsentMsgs() {
  
  function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
    var messageList = gFolderDisplay.selectedMessageUris;
@@ -5638,7 +5616,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint() {
-@@ -1810,17 +1810,17 @@ function getMessageBrowser() {
+@@ -1811,17 +1811,17 @@ function getMessageBrowser() {
  // The zoom manager, view source and possibly some other functions still rely
  // on the getBrowser function.
  function getBrowser() {
@@ -5657,7 +5635,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2575,17 +2575,17 @@ function IgnoreMDNResponse() {
+@@ -2576,17 +2576,17 @@ function IgnoreMDNResponse() {
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5676,7 +5654,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        return;
      Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
  
-@@ -2595,26 +2595,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2596,26 +2596,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5941,7 +5919,7 @@ diff --git a/suite/mailnews/content/tabmail.js b/suite/mailnews/content/tabmail.
 diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
 --- a/suite/mailnews/jar.mn
 +++ b/suite/mailnews/jar.mn
-@@ -6,66 +6,66 @@ messenger.jar:
+@@ -6,65 +6,65 @@ messenger.jar:
  % content messagebody %content/messagebody/ contentaccessible=yes
  % content messenger %content/messenger/
  % override chrome://global/content/nsDragAndDrop.js chrome://messenger/content/nsDragAndDrop.js
@@ -5952,14 +5930,12 @@ diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
  % content messenger-region %content/messenger-region/
 -% overlay chrome://communicator/content/pref/preferences.xul                   chrome://messenger/content/mailPrefsOverlay.xul
 -% overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
--% overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 -% overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 -% overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
 -% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
 -% overlay chrome://editor/content/composerOverlay.xul                          chrome://messenger/content/mailEditorOverlay.xul
 +% overlay chrome://communicator/content/pref/preferences.xhtml                 chrome://messenger/content/mailPrefsOverlay.xhtml
 +% overlay chrome://communicator/content/pref/pref-appearance.xhtml             chrome://messenger/content/mailPrefsOverlay.xhtml
-+% overlay chrome://communicator/content/pref/pref-scripts.xhtml                chrome://messenger/content/mailPrefsOverlay.xhtml
 +% overlay chrome://communicator/content/pref/pref-cookies.xhtml                chrome://messenger/content/mailPrefsOverlay.xhtml
 +% overlay chrome://editor/content/editorTasksOverlay.xhtml                     chrome://messenger/content/mailTasksOverlay.xhtml
 +% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xhtml chrome://messenger/content/mailOverlay.xhtml

comm-central/patches/series

@@ -1,4 +1,3 @@
-9999999-suite-extensions.patch
 TOP-1642188-remove-nsDOMIEvent-cc.patch
 TOP-1611010-DOMEventListener-cc.patch
 TOP-1614671-port1456035-4-and-5-61a1-cc.patch