rebase after pushes

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

@@ -3,7 +3,7 @@
 # Date 1614281942 18000
 #      Thu Feb 25 14:39:02 2021 -0500
 # Node ID bb393fb8c191edfbc49148ee98ac937bf9a9db6f
-# Parent  71e002e5705490a5127e6052b199d63478ad0c49
+# Parent  91425403b791e4dfe4628c401463dc0cacb06065
 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
@@ -5041,7 +5041,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
-@@ -698,17 +698,17 @@ function saveAsVirtualFolder()
+@@ -703,17 +703,17 @@ function saveAsVirtualFolder()
    var searchSubfolders = document.getElementById("checkSearchSubFolders").checked;
    if (gMsgFolderSelected && (searchSubfolders || gMsgFolderSelected.isServer || gMsgFolderSelected.noSelect))
    {
@@ -5091,7 +5091,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
-@@ -1703,17 +1703,17 @@ var gFolderTreeController = {
+@@ -1721,17 +1721,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
@@ -5110,7 +5110,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    },
  
    /**
-@@ -1778,17 +1778,17 @@ var gFolderTreeController = {
+@@ -1796,17 +1796,17 @@ var gFolderTreeController = {
        // context menu on a non-loaded folder).
        if (msgFolder == GetLoadedMsgFolder()) {
          gRerootOnFolderLoad = true;
@@ -5129,7 +5129,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
                         rebuildSummaryCallback: rebuildSummary});
    },
  
-@@ -1809,17 +1809,17 @@ var gFolderTreeController = {
+@@ -1827,17 +1827,17 @@ var gFolderTreeController = {
  
        controller._resetThreadPane();
        let folderTree = document.getElementById("folderTree");
@@ -5148,7 +5148,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.
-@@ -1968,17 +1968,17 @@ var gFolderTreeController = {
+@@ -1986,17 +1986,17 @@ var gFolderTreeController = {
      let folder = aParent || GetSelectedMsgFolders()[0];
      if (!folder)
        folder = GetDefaultAccountRootFolder();
@@ -5167,7 +5167,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
     *
-@@ -1990,17 +1990,17 @@ var gFolderTreeController = {
+@@ -2008,17 +2008,17 @@ var gFolderTreeController = {
      function editVirtualCallback(aURI) {
        // we need to reload the folder if it is the currently loaded folder...
        if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {
@@ -5544,7 +5544,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
-@@ -1477,17 +1477,17 @@ function MsgOpenFromFile()
+@@ -1472,17 +1472,17 @@ function MsgOpenFromFile()
  
    fp.open(rv => {
      if (rv != nsIFilePicker.returnOK || !fp.file) {
@@ -5563,7 +5563,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)
-@@ -1627,17 +1627,17 @@ function MsgOpenNewWindowForMessage(mess
+@@ -1622,17 +1622,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
@@ -5582,26 +5582,26 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    window.close();
  }
  
-@@ -1660,17 +1660,17 @@ function MsgMarkAsFlagged(markFlagged)
-     if (!markFlagged) {
-         markFlagged = !SelectedMessagesAreFlagged();
-     }
-     MarkSelectedMessagesFlagged(markFlagged);
+@@ -1666,17 +1666,17 @@ function MsgMarkMsgAsRead(read) {
+ 
+ function MsgMarkAsFlagged()
+ {
+   MarkSelectedMessagesFlagged(!SelectedMessagesAreFlagged());
  }
  
  function MsgMarkReadByDate()
  {
--    window.openDialog( "chrome://messenger/content/markByDate.xul","",
-+    window.openDialog( "chrome://messenger/content/markByDate.xhtml","",
-                        "chrome,modal,titlebar,centerscreen",
-                        GetLoadedMsgFolder() );
+-  window.openDialog("chrome://messenger/content/markByDate.xul","",
++  window.openDialog("chrome://messenger/content/markByDate.xhtml","",
+                     "chrome,modal,titlebar,centerscreen",
+                     GetLoadedMsgFolder());
  }
  
  function MsgMarkAllRead()
  {
    let folders = GetSelectedMsgFolders();
    for (let folder of folders)
-@@ -1751,17 +1751,17 @@ function MsgFilters(emailAddress, folder
+@@ -1757,17 +1757,17 @@ function MsgFilters(emailAddress, folder
  {
      if (!folder)
        folder = GetFirstSelectedMsgFolder();
@@ -5620,7 +5620,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        {
           args = { refresh: true, folder: folder };
           MsgFilterList(args);
-@@ -1923,17 +1923,17 @@ function PrintEnginePrintInternal(aDoPri
+@@ -1929,17 +1929,17 @@ function PrintEnginePrintInternal(aDoPri
  {
    var messageList = gFolderDisplay.selectedMessageUris;
    if (!messageList)
@@ -5639,7 +5639,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint()
-@@ -2041,17 +2041,17 @@ function getMessageBrowser()
+@@ -2047,17 +2047,17 @@ function getMessageBrowser()
  function getBrowser()
  {
    return GetTabMail() ? GetTabMail().getBrowserForSelectedTab() :
@@ -5658,7 +5658,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2879,17 +2879,17 @@ function IgnoreMDNResponse()
+@@ -2885,17 +2885,17 @@ function IgnoreMDNResponse()
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5677,7 +5677,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
      if (!Services.prefs.getBoolPref("mailnews.ui.junk.firstuse"))
        return;
      Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
-@@ -2900,28 +2900,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2906,28 +2906,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5766,7 +5766,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/con
  
  <commandset id="globalEditMenuItems"
              commandupdater="true"
-@@ -1194,29 +1194,29 @@
+@@ -1198,29 +1198,29 @@
                  disabled="true"
                  command="cmd_stop"/>
        <menuitem id="menu_Stop"
@@ -5798,7 +5798,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">
-@@ -1839,17 +1839,17 @@
+@@ -1849,17 +1849,17 @@
        <button id="button-advanced"
                label="&advancedButton.label;"
                accesskey="&advancedButton.accesskey;"