Rebase after pushes

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

@@ -3,7 +3,7 @@
 # Date 1645962131 18000
 #      Sun Feb 27 06:42:11 2022 -0500
 # Node ID 97992f8ecdb8a0607194d1f6c460bdbd3e5a25f2
-# Parent  2ec69e9396cdfafff131cd6df15e08a00a980e6c
+# Parent  23fb3bc03bcdbd426bb232768e7ce303baea59aa
 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
@@ -4573,7 +4573,7 @@ diff --git a/suite/mailnews/components/addrbook/jar.mn b/suite/mailnews/componen
 diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
 --- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
 +++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
-@@ -1751,17 +1751,17 @@ function GenericSendMessage(msgType) {
+@@ -1763,17 +1763,17 @@ function GenericSendMessage(msgType) {
        msgType == Ci.nsIMsgCompDeliverMode.Background) {
      //Do we need to check the spelling?
      if (DoSpellCheckBeforeSend()) {
@@ -4592,7 +4592,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
  
      // Strip trailing spaces and long consecutive WSP sequences from the
      // subject line to prevent getting only WSP chars on a folded line.
-@@ -1834,17 +1834,17 @@ function GenericSendMessage(msgType) {
+@@ -1846,17 +1846,17 @@ function GenericSendMessage(msgType) {
      if (!CheckValidEmailAddress(msgCompFields.to, msgCompFields.cc, msgCompFields.bcc))
        return;
  
@@ -4611,7 +4611,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
      }
  
      // We will remember the users "send format" decision in the address
-@@ -2183,17 +2183,17 @@ function SelectAddress()
+@@ -2195,17 +2195,17 @@ function SelectAddress()
  
    Recipients2CompFields(msgCompFields);
  
@@ -4630,7 +4630,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
               ccAddress:ccAddress,
               bccAddress:bccAddress});
    // We have to set focus to the addressingwidget because we seem to loose focus often
-@@ -2742,17 +2742,17 @@ function MessageGetNumSelectedAttachment
+@@ -2754,17 +2754,17 @@ function MessageGetNumSelectedAttachment
  {
    var bucketList = GetMsgAttachmentElement();
    return (bucketList) ? bucketList.selectedItems.length : 0;
@@ -5188,7 +5188,7 @@ diff --git a/suite/mailnews/content/mail-offline.js b/suite/mailnews/content/mai
 diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mailCommands.js
 --- a/suite/mailnews/content/mailCommands.js
 +++ b/suite/mailnews/content/mailCommands.js
-@@ -242,17 +242,17 @@ function NewMessageToSelectedAddresses(t
+@@ -244,17 +244,17 @@ function NewMessageToSelectedAddresses(t
        params.composeFields = composeFields;
        msgComposeService.OpenComposeWindowWithParams(null, params);
      }
@@ -5207,7 +5207,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
  function SubscribeOKCallback(changeTable)
  {
    for (var serverURI in changeTable) {
-@@ -390,17 +390,17 @@ function ViewPageSource(messages)
+@@ -392,17 +392,17 @@ function ViewPageSource(messages)
        // Now, we need to get a URL from a URI.
        var url = MailServices.mailSession.ConvertMsgURIToMsgURL(messages[i],
                                                                 msgWindow);
@@ -5229,7 +5229,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
 diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content/mailContextMenus.js
 --- a/suite/mailnews/content/mailContextMenus.js
 +++ b/suite/mailnews/content/mailContextMenus.js
-@@ -514,26 +514,26 @@ function AddContact(aEmailAddressNode)
+@@ -531,26 +531,26 @@ function AddContact(aEmailAddressNode)
  {
    if (aEmailAddressNode)
      AddEmailToAddressBook(aEmailAddressNode.getAttribute("emailAddress"),
@@ -5258,7 +5258,7 @@ diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content
  
  /**
   * SendMailToNode takes the email address title button, extracts the email address
-@@ -676,17 +676,17 @@ function OpenMessageByHeader(messageHead
+@@ -693,17 +693,17 @@ function OpenMessageByHeader(messageHead
  {
    var folder    = messageHeader.folder;
    var folderURI = folder.URI;
@@ -5521,7 +5521,7 @@ 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
-@@ -1308,17 +1308,17 @@ function MsgOpenFromFile() {
+@@ -1351,17 +1351,17 @@ function MsgOpenFromFile() {
  
    fp.open(rv => {
      if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
@@ -5540,7 +5540,7 @@ 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)
-@@ -1453,17 +1453,17 @@ function MsgOpenNewWindowForMessage(mess
+@@ -1496,17 +1496,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
@@ -5559,7 +5559,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function MsgJunk() {
-@@ -1493,17 +1493,17 @@ function MsgMarkMsgAsRead(read) {
+@@ -1536,17 +1536,17 @@ function MsgMarkMsgAsRead(read) {
    MarkSelectedMessagesRead(read);
  }
  
@@ -5578,7 +5578,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    let folders = GetSelectedMsgFolders();
    for (let folder of folders)
      folder.markAllMessagesRead(msgWindow);
-@@ -1573,17 +1573,17 @@ function MsgMarkAllFoldersRead() {
+@@ -1616,17 +1616,17 @@ function MsgMarkAllFoldersRead() {
  
  function MsgFilters(emailAddress, folder) {
    if (!folder)
@@ -5597,7 +5597,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
      if ("refresh" in args && args.refresh) {
         args = { refresh: true, folder, filter: args.newFilter };
         MsgFilterList(args);
-@@ -1723,17 +1723,17 @@ function MsgSendUnsentMsgs() {
+@@ -1766,17 +1766,17 @@ function MsgSendUnsentMsgs() {
  
  function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
    var messageList = gFolderDisplay.selectedMessageUris;
@@ -5616,7 +5616,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint() {
-@@ -1811,17 +1811,17 @@ function getMessageBrowser() {
+@@ -1854,17 +1854,17 @@ function getMessageBrowser() {
  // The zoom manager, view source and possibly some other functions still rely
  // on the getBrowser function.
  function getBrowser() {
@@ -5635,7 +5635,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2576,17 +2576,17 @@ function IgnoreMDNResponse() {
+@@ -2619,17 +2619,17 @@ function IgnoreMDNResponse() {
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5654,7 +5654,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        return;
      Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
  
-@@ -2596,26 +2596,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2639,26 +2639,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5741,7 +5741,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/con
  
  <commandset id="globalEditMenuItems"
              commandupdater="true"
-@@ -1198,29 +1198,29 @@
+@@ -1220,29 +1220,29 @@
                  disabled="true"
                  command="cmd_stop"/>
        <menuitem id="menu_Stop"
@@ -5773,7 +5773,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/con
      <menupopup id="menu_GoPopup" onpopupshowing="InitGoMessagesMenu();">
        <menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
          <menupopup id="menu_GoNextPopup">
-@@ -1849,17 +1849,17 @@
+@@ -1883,17 +1883,17 @@
        <button id="button-advanced"
                label="&advancedButton.label;"
                accesskey="&advancedButton.accesskey;"
@@ -5839,7 +5839,7 @@ diff --git a/suite/mailnews/content/messenger.xhtml b/suite/mailnews/content/mes
 diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
 --- a/suite/mailnews/content/msgHdrViewOverlay.js
 +++ b/suite/mailnews/content/msgHdrViewOverlay.js
-@@ -1412,30 +1412,30 @@ createNewAttachmentInfo.prototype.saveAt
+@@ -1414,30 +1414,30 @@ createNewAttachmentInfo.prototype.saveAt
                               false);
  }
  

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  c9c2afb3ab56e817efff29c52968206a8f8744e2
+# Parent  47a6153e0a0156ccc44df2e5f28ae751fa48edb5
 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
@@ -1628,7 +1628,7 @@ diff --git a/suite/extensions/debugQA/content/debugQAEditorOverlay.js b/suite/ex
 diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
 --- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
 +++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
-@@ -437,25 +437,18 @@ var progressListener = {
+@@ -449,25 +449,18 @@ var progressListener = {
        } catch (ex) {}
      },
  
@@ -1656,7 +1656,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
    {
      switch (command)
      {
-@@ -2900,25 +2893,18 @@ function OpenSelectedAttachment()
+@@ -2912,25 +2905,18 @@ function OpenSelectedAttachment()
  }
  
  function nsAttachmentOpener()
@@ -1852,7 +1852,7 @@ 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
-@@ -1168,25 +1168,20 @@ BatchMessageMover.prototype =
+@@ -1199,25 +1199,20 @@ BatchMessageMover.prototype =
      if (aFolder.parent == this._dstFolderParent &&
          aFolder.name == this._dstFolderName) {
        this._dstFolderParent = null;
@@ -1933,7 +1933,7 @@ diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/conten
        if (gCollectAddressTimer)
        {
          clearTimeout(gCollectAddressTimer);
-@@ -1941,17 +1941,17 @@ var attachmentAreaDNDObserver = {
+@@ -1940,17 +1940,17 @@ var attachmentAreaDNDObserver = {
  };
  
  function nsFlavorDataProvider()