rebase after pushes

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  b00b527fac4f73d74fe8befe9018b4bb2739899e
+# Parent  2973016502c732f1280f5d8ef433b7eeef8ce96f
 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
@@ -5543,10 +5543,10 @@ diff --git a/suite/mailnews/content/mailWidgets.xml b/suite/mailnews/content/mai
 diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
 --- a/suite/mailnews/content/mailWindowOverlay.js
 +++ b/suite/mailnews/content/mailWindowOverlay.js
-@@ -1474,17 +1474,17 @@ function MsgOpenFromFile()
+@@ -1311,17 +1311,17 @@ function MsgOpenFromFile() {
  
    fp.open(rv => {
-     if (rv != nsIFilePicker.returnOK || !fp.file) {
+     if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
        return;
      }
      let uri = fp.fileURL.QueryInterface(Ci.nsIURL);
@@ -5554,7 +5554,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  
 -    window.openDialog("chrome://messenger/content/messageWindow.xul", "_blank",
 +    window.openDialog("chrome://messenger/content/messageWindow.xhtml", "_blank",
-                     "all,chrome,dialog=no,status,toolbar", uri);
+                       "all,chrome,dialog=no,status,toolbar", uri);
    });
  }
  
@@ -5562,68 +5562,68 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    let mailWindowService = Cc["@mozilla.org/messenger/windowservice;1"]
                              .getService(Ci.nsIMessengerWindowService);
    if (!mailWindowService)
-@@ -1624,17 +1624,17 @@ function MsgOpenNewWindowForMessage(mess
-         // required because on a right-click, the currentIndex value will be
-         // different from the actual row that is highlighted.
-         // GetSelectedMsgFolders() will return the message that is
-         // highlighted.
-         folderUri = GetSelectedMsgFolders()[0].URI;
- 
-     // be sure to pass in the current view....
-     if (messageUri && folderUri) {
--        window.openDialog( "chrome://messenger/content/messageWindow.xul", "_blank", "all,chrome,dialog=no,status,toolbar", messageUri, folderUri, gDBView );
-+        window.openDialog( "chrome://messenger/content/messageWindow.xhtml", "_blank", "all,chrome,dialog=no,status,toolbar", messageUri, folderUri, gDBView );
-     }
+@@ -1456,17 +1456,17 @@ function MsgOpenNewWindowForMessage(mess
+       // required because on a right-click, the currentIndex value will be
+       // different from the actual row that is highlighted.
+       // GetSelectedMsgFolders() will return the message that is
+       // highlighted.
+       folderUri = GetSelectedMsgFolders()[0].URI;
+ 
+   // be sure to pass in the current view....
+   if (messageUri && folderUri) {
+-      window.openDialog( "chrome://messenger/content/messageWindow.xul", "_blank", "all,chrome,dialog=no,status,toolbar", messageUri, folderUri, gDBView );
++      window.openDialog( "chrome://messenger/content/messageWindow.xhtml", "_blank", "all,chrome,dialog=no,status,toolbar", messageUri, folderUri, gDBView );
+   }
  }
  
- function CloseMailWindow()
- {
+ function CloseMailWindow() {
    window.close();
  }
  
-@@ -1668,17 +1668,17 @@ function MsgMarkMsgAsRead(read) {
+ function MsgJunk() {
+@@ -1496,17 +1496,17 @@ function MsgMarkMsgAsRead(read) {
+   MarkSelectedMessagesRead(read);
+ }
  
- function MsgMarkAsFlagged()
- {
+ function MsgMarkAsFlagged() {
    MarkSelectedMessagesFlagged(!SelectedMessagesAreFlagged());
  }
  
- function MsgMarkReadByDate()
- {
--  window.openDialog("chrome://messenger/content/markByDate.xul","",
-+  window.openDialog("chrome://messenger/content/markByDate.xhtml","",
+ function MsgMarkReadByDate() {
+-  window.openDialog("chrome://messenger/content/markByDate.xul", "",
++  window.openDialog("chrome://messenger/content/markByDate.xhtml", "",
                      "chrome,modal,titlebar,centerscreen",
                      GetLoadedMsgFolder());
  }
  
- function MsgMarkAllRead()
- {
+ function MsgMarkAllRead() {
    let folders = GetSelectedMsgFolders();
    for (let folder of folders)
-@@ -1759,17 +1759,17 @@ function MsgFilters(emailAddress, folder
- {
-     if (!folder)
-       folder = GetFirstSelectedMsgFolder();
-     var args;
-     if (emailAddress)
-     {
-       // Prefill the filterEditor with the emailAddress.
-       args = {filterList: folder.getEditableFilterList(msgWindow), filterName: emailAddress};
--      window.openDialog("chrome://messenger/content/FilterEditor.xul", "",
-+      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 ("refresh" in args && args.refresh)
-       {
-          args = { refresh: true, folder: folder };
-          MsgFilterList(args);
-@@ -1931,17 +1931,17 @@ function PrintEnginePrintInternal(aDoPri
- {
+     folder.markAllMessagesRead(msgWindow);
+@@ -1576,17 +1576,17 @@ function MsgMarkAllFoldersRead() {
+ 
+ function MsgFilters(emailAddress, folder) {
+   if (!folder)
+     folder = GetFirstSelectedMsgFolder();
+   var args;
+   if (emailAddress) {
+     // Prefill the filterEditor with the emailAddress.
+     args = {filterList: folder.getEditableFilterList(msgWindow), filterName: emailAddress};
+-    window.openDialog("chrome://messenger/content/FilterEditor.xul", "",
++    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 ("refresh" in args && args.refresh) {
+        args = { refresh: true, folder };
+        MsgFilterList(args);
+     }
+@@ -1725,17 +1725,17 @@ function MsgSendUnsentMsgs() {
+ 
+ function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
    var messageList = gFolderDisplay.selectedMessageUris;
-   if (!messageList)
-   {
+   if (!messageList) {
      dump("PrintEnginePrint(): No messages selected.\n");
      return false;
    }
@@ -5637,27 +5637,27 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  
  }
  
- function PrintEnginePrint()
-@@ -2049,17 +2049,17 @@ function getMessageBrowser()
- function getBrowser()
- {
+ function PrintEnginePrint() {
+@@ -1813,17 +1813,17 @@ function getMessageBrowser() {
+ // The zoom manager, view source and possibly some other functions still rely
+ // on the getBrowser function.
+ function getBrowser() {
    return GetTabMail() ? GetTabMail().getBrowserForSelectedTab() :
                          getMessageBrowser();
  }
  
- function MsgSynchronizeOffline()
- {
+ function MsgSynchronizeOffline() {
 -  window.openDialog("chrome://messenger/content/msgSynchronize.xul", "",
 +  window.openDialog("chrome://messenger/content/msgSynchronize.xhtml", "",
                      "centerscreen,chrome,modal,titlebar,resizable",
-                     {msgWindow:msgWindow});
+                     {msgWindow});
  }
  
  function MsgOpenAttachment() {}
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2887,17 +2887,17 @@ function IgnoreMDNResponse()
+@@ -2578,17 +2578,17 @@ function IgnoreMDNResponse() {
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5665,18 +5665,18 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
   */
  function MsgSearchMessages(aFolder) {
    let folder = aFolder || gFolderDisplay.displayedFolder;
-   OpenOrFocusWindow({ folder: folder }, "mailnews:search",
+   OpenOrFocusWindow({ folder }, "mailnews:search",
 -                    "chrome://messenger/content/SearchDialog.xul");
 +                    "chrome://messenger/content/SearchDialog.xhtml");
  }
  
- function MsgJunkMailInfo(aCheckFirstUse)
- {
+ function MsgJunkMailInfo(aCheckFirstUse) {
    if (aCheckFirstUse) {
      if (!Services.prefs.getBoolPref("mailnews.ui.junk.firstuse"))
        return;
      Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
-@@ -2908,28 +2908,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
+ 
+@@ -2598,26 +2598,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5689,25 +5689,23 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
 +    window.openDialog("chrome://messenger/content/junkMailInfo.xhtml", "mailnews:junkmailinfo", "centerscreen,resizeable=no,titlebar,chrome,modal", null);
  }
  
- function MsgSearchAddresses()
- {
+ function MsgSearchAddresses() {
    var args = { directory: null };
 -  OpenOrFocusWindow(args, "mailnews:absearch", "chrome://messenger/content/ABSearchDialog.xul");
 +  OpenOrFocusWindow(args, "mailnews:absearch", "chrome://messenger/content/ABSearchDialog.xhtml");
  }
  
- function MsgFilterList(args)
- {
+ function MsgFilterList(args) {
 -  OpenOrFocusWindow(args, "mailnews:filterlist", "chrome://messenger/content/FilterListDialog.xul");
 +  OpenOrFocusWindow(args, "mailnews:filterlist", "chrome://messenger/content/FilterListDialog.xhtml");
  }
  
- function OpenOrFocusWindow(args, windowType, chromeURL)
- {
+ function OpenOrFocusWindow(args, windowType, chromeURL) {
    var desiredWindow = Services.wm.getMostRecentWindow(windowType);
  
    if (desiredWindow) {
      desiredWindow.focus();
+     if ("refresh" in args && args.refresh)
 diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/content/mailWindowOverlay.xhtml
 --- a/suite/mailnews/content/mailWindowOverlay.xhtml
 +++ b/suite/mailnews/content/mailWindowOverlay.xhtml

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

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1581435120 -3600
-# Parent  37e16ba1bd051e061149af45e110a0e1af69bc8c
+# Parent  af1d24a78c4660170c2a36dc0630618698853ebc
 Bug 1614671 - Port |Bug 1456035 Part 4 - Convert callers of XPCOMUtils.generateQI to ChromeUtils.generateQI|, |Bug 1456035 Part 5 - Convert manual QueryInterface to ChromeUtils.generateQI| and |Bug 1460092 - Add ESLint rule to enforce use of ChromeUtils.generateQI| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -1893,17 +1893,16 @@ diff --git a/suite/mailnews/content/mailWindow.js b/suite/mailnews/content/mailW
 diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
 --- a/suite/mailnews/content/mailWindowOverlay.js
 +++ b/suite/mailnews/content/mailWindowOverlay.js
-@@ -1319,26 +1319,20 @@ BatchMessageMover.prototype =
-         aFolder.name == this._dstFolderName)
-     {
+@@ -1171,25 +1171,20 @@ BatchMessageMover.prototype =
+     if (aFolder.parent == this._dstFolderParent &&
+         aFolder.name == this._dstFolderName) {
        this._dstFolderParent = null;
        this._dstFolderName = null;
        this.continueBatch();
      }
    },
  
--  QueryInterface: function(aIID)
--  {
+-  QueryInterface(aIID) {
 -    if (aIID.equals(Ci.nsIUrlListener) ||
 -        aIID.equals(Ci.nsIMsgCopyServiceListener) ||
 -        aIID.equals(Ci.nsIMsgFolderListener) ||
@@ -1918,12 +1917,12 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
 +                                          Ci.nsIMsgOperationListener]),
  }
  
- function MsgArchiveSelectedMessages(aEvent)
- {
+ function MsgArchiveSelectedMessages(aEvent) {
    let batchMover = new BatchMessageMover();
    batchMover.archiveMessages(gFolderDisplay.selectedMessages);
  }
  
+ 
 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