rebasing

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 1631357814 14400
-#      Sat Sep 11 06:56:54 2021 -0400
-# Node ID 9ffa151d86e839090d4ef53158411f9870582bbd
-# Parent  87780795e9175bde1b1e11f0022ec0bd13ad2665
+# Date 1633169929 14400
+#      Sat Oct 02 06:18:49 2021 -0400
+# Node ID 9151e19098171a996ebd78cc1ea551a3e7de91ff
+# Parent  3cd0b356afcb04d39420b4d71921358ab69b5550
 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
@@ -5032,7 +5032,7 @@ diff --git a/suite/mailnews/content/FilterListDialog.xhtml b/suite/mailnews/cont
 diff --git a/suite/mailnews/content/SearchDialog.js b/suite/mailnews/content/SearchDialog.js
 --- a/suite/mailnews/content/SearchDialog.js
 +++ b/suite/mailnews/content/SearchDialog.js
-@@ -703,17 +703,17 @@ function saveAsVirtualFolder()
+@@ -704,17 +704,17 @@ function saveAsVirtualFolder()
    var searchSubfolders = document.getElementById("checkSearchSubFolders").checked;
    if (gMsgFolderSelected && (searchSubfolders || gMsgFolderSelected.isServer || gMsgFolderSelected.noSelect))
    {
@@ -5082,7 +5082,7 @@ diff --git a/suite/mailnews/content/SearchDialog.xhtml b/suite/mailnews/content/
 diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folderPane.js
 --- a/suite/mailnews/content/folderPane.js
 +++ b/suite/mailnews/content/folderPane.js
-@@ -1735,17 +1735,17 @@ var gFolderTreeController = {
+@@ -1734,17 +1734,17 @@ var gFolderTreeController = {
        // createSubfolder can throw an exception, causing the newFolder dialog
        // to not close and wait for another input.
        // TODO: Rewrite this logic and move the opening of alert dialogs from
@@ -5101,7 +5101,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    },
  
    /**
-@@ -1810,17 +1810,17 @@ var gFolderTreeController = {
+@@ -1809,17 +1809,17 @@ var gFolderTreeController = {
        // context menu on a non-loaded folder).
        if (msgFolder == GetLoadedMsgFolder()) {
          gRerootOnFolderLoad = true;
@@ -5120,7 +5120,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
                         rebuildSummaryCallback: rebuildSummary});
    },
  
-@@ -1841,17 +1841,17 @@ var gFolderTreeController = {
+@@ -1840,17 +1840,17 @@ var gFolderTreeController = {
  
        controller._resetThreadPane();
        let folderTree = document.getElementById("folderTree");
@@ -5139,7 +5139,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    /**
     * Deletes a folder from its parent. Also handles unsubscribe from newsgroups
     * if the selected folder/s happen to be nntp.
-@@ -2000,17 +2000,17 @@ var gFolderTreeController = {
+@@ -1999,17 +1999,17 @@ var gFolderTreeController = {
      let folder = aParent || GetSelectedMsgFolders()[0];
      if (!folder)
        folder = GetDefaultAccountRootFolder();
@@ -5158,7 +5158,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    /**
     * Opens the dialog to edit the properties for a virtual folder
     *
-@@ -2022,17 +2022,17 @@ var gFolderTreeController = {
+@@ -2021,17 +2021,17 @@ var gFolderTreeController = {
      function editVirtualCallback(aURI) {
        // we need to reload the folder if it is the currently loaded folder...
        if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1749,7 +1749,7 @@ diff --git a/suite/mailnews/components/compose/content/addressingWidgetOverlay.j
 diff --git a/suite/mailnews/content/SearchDialog.js b/suite/mailnews/content/SearchDialog.js
 --- a/suite/mailnews/content/SearchDialog.js
 +++ b/suite/mailnews/content/SearchDialog.js
-@@ -497,24 +497,17 @@ nsMsgSearchCommandUpdater.prototype =
+@@ -498,24 +498,17 @@ nsMsgSearchCommandUpdater.prototype =
  
    updateNextMessageAfterDelete : function()
    {
@@ -1926,7 +1926,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
 diff --git a/suite/mailnews/content/messageWindow.js b/suite/mailnews/content/messageWindow.js
 --- a/suite/mailnews/content/messageWindow.js
 +++ b/suite/mailnews/content/messageWindow.js
-@@ -154,24 +154,17 @@ nsMsgDBViewCommandUpdater.prototype =
+@@ -153,24 +153,17 @@ nsMsgDBViewCommandUpdater.prototype =
  
    updateNextMessageAfterDelete : function()
    {