rebase

comm-central/patches/1792578-flushmemory-25315.patch

@@ -7,7 +7,7 @@ Bug 1792578 - Remove use of nsIMemory. r=frg
 diff --git a/suite/extensions/debugQA/content/debugQAMenuOverlay.js b/suite/extensions/debugQA/content/debugQAMenuOverlay.js
 --- a/suite/extensions/debugQA/content/debugQAMenuOverlay.js
 +++ b/suite/extensions/debugQA/content/debugQAMenuOverlay.js
-@@ -35,8 +35,16 @@ function onLoadBloat()
+@@ -36,8 +36,16 @@ function onLoadBloat()
  // Open a debug QA link from the menu in the current tab.
  function openQAUrl(aUrl)
  {

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 1658141579 14400
-#      Mon Jul 18 06:52:59 2022 -0400
-# Node ID 6ef171b486c309dd36f059d4e3cdc575978d195f
-# Parent  e352984c73426802110888060346b9643b9ee735
+# Date 1665393659 14400
+#      Mon Oct 10 05:20:59 2022 -0400
+# Node ID 9953af63824015fab61f3b092c446480b437f422
+# Parent  715b0f0df53bb0ebc27d4df4ea93f85760318518
 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
@@ -396,7 +396,7 @@ diff --git a/suite/base/content/viewSourceOverlay.xhtml b/suite/base/content/vie
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
 --- a/suite/base/content/viewZoomOverlay.js
 +++ b/suite/base/content/viewZoomOverlay.js
-@@ -324,17 +324,17 @@ var FullZoom = FullZoom || {
+@@ -321,17 +321,17 @@ var FullZoom = FullZoom || {
  
      if (aValue > ZoomManager.MAX)
        return ZoomManager.MAX;
@@ -415,7 +415,7 @@ diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoom
  
    var zoomBundle = document.getElementById("bundle_viewZoom");
    var zoomMenu = document.getElementById("menu_zoom");
-@@ -436,17 +436,17 @@ function updateZoomMenu() {
+@@ -433,17 +433,17 @@ function updateZoomMenu() {
  }
  
  function openZoomDialog() {
@@ -1999,7 +1999,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
    // profile startup handler (contains profile initialization routines)
    _onProfileStartup: function()
    {
-@@ -802,17 +802,17 @@ SuiteGlue.prototype = {
+@@ -827,17 +827,17 @@ SuiteGlue.prototype = {
                     .createInstance(Ci.nsIMutableArray);
      let str = Cc["@mozilla.org/supports-string;1"]
                  .createInstance(Ci.nsISupportsString);
@@ -2018,7 +2018,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
  
      Services.prefs.clearUserPref(PREF_EM_NEW_ADDONS_LIST);
    },
-@@ -1006,17 +1006,17 @@ SuiteGlue.prototype = {
+@@ -1031,17 +1031,17 @@ SuiteGlue.prototype = {
      if (ShellService) try {
        var appTypes = ShellService.shouldBeDefaultClientFor;
  
@@ -4424,7 +4424,7 @@ diff --git a/suite/mailnews/components/addrbook/content/abSelectAddressesDialog.
 diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/mailnews/components/addrbook/content/addressbook.js
 --- a/suite/mailnews/components/addrbook/content/addressbook.js
 +++ b/suite/mailnews/components/addrbook/content/addressbook.js
-@@ -211,17 +211,17 @@ function AbPrintCardInternal(doPrintPrev
+@@ -212,17 +212,17 @@ function AbPrintCardInternal(doPrintPrev
    for (let i = 0; i < numSelected; i++) {
      let card = selectedItems[i];
      let printCardUrl = CreatePrintCardUrl(card);
@@ -4443,7 +4443,7 @@ diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/m
    return;
  }
  
-@@ -253,17 +253,17 @@ function AbPrintAddressBookInternal(doPr
+@@ -254,17 +254,17 @@ function AbPrintAddressBookInternal(doPr
    /*
      turn "moz-abmdbdirectory://abook.mab" into
      "addbook://moz-abmdbdirectory/abook.mab?action=print"
@@ -4462,7 +4462,7 @@ diff --git a/suite/mailnews/components/addrbook/content/addressbook.js b/suite/m
    return;
  }
  
-@@ -382,17 +382,17 @@ function onAdvancedAbSearch()
+@@ -383,17 +383,17 @@ function onAdvancedAbSearch()
    let selectedDirURI = getSelectedDirectoryURI();
    if (!selectedDirURI)
      return;
@@ -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
-@@ -2754,17 +2754,17 @@ function MessageGetNumSelectedAttachment
+@@ -2762,17 +2762,17 @@ function MessageGetNumSelectedAttachment
  {
    var bucketList = GetMsgAttachmentElement();
    return (bucketList) ? bucketList.selectedItems.length : 0;
@@ -4813,7 +4813,7 @@ diff --git a/suite/mailnews/components/prefs/content/mailPrefsOverlay.xhtml b/su
 diff --git a/suite/mailnews/components/prefs/content/pref-junk.js b/suite/mailnews/components/prefs/content/pref-junk.js
 --- a/suite/mailnews/components/prefs/content/pref-junk.js
 +++ b/suite/mailnews/components/prefs/content/pref-junk.js
-@@ -15,17 +15,17 @@ function Startup()
+@@ -16,17 +16,17 @@ function Startup()
  function UpdateDependentElement(aBaseId, aDependentId)
  {
    var pref = document.getElementById(aBaseId).getAttribute("preference");
@@ -5068,7 +5068,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 = {
+@@ -1736,17 +1736,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
@@ -5087,7 +5087,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    },
  
    /**
-@@ -1810,17 +1810,17 @@ var gFolderTreeController = {
+@@ -1811,17 +1811,17 @@ var gFolderTreeController = {
        // context menu on a non-loaded folder).
        if (msgFolder == GetLoadedMsgFolder()) {
          gRerootOnFolderLoad = true;
@@ -5106,7 +5106,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
                         rebuildSummaryCallback: rebuildSummary});
    },
  
-@@ -1841,17 +1841,17 @@ var gFolderTreeController = {
+@@ -1842,17 +1842,17 @@ var gFolderTreeController = {
  
        controller._resetThreadPane();
        let folderTree = document.getElementById("folderTree");
@@ -5125,7 +5125,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.
-@@ -1998,17 +1998,17 @@ var gFolderTreeController = {
+@@ -1999,17 +1999,17 @@ var gFolderTreeController = {
      let folder = aParent || GetSelectedMsgFolders()[0];
      if (!folder)
        folder = GetDefaultAccountRootFolder();
@@ -5144,7 +5144,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
     *
-@@ -2020,17 +2020,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) {
@@ -5326,7 +5326,8 @@ diff --git a/suite/mailnews/content/mailEditorOverlay.xhtml b/suite/mailnews/con
 diff --git a/suite/mailnews/content/mailOverlay.js b/suite/mailnews/content/mailOverlay.js
 --- a/suite/mailnews/content/mailOverlay.js
 +++ b/suite/mailnews/content/mailOverlay.js
-@@ -1,15 +1,15 @@
+@@ -1,16 +1,16 @@
+ /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
  /* This Source Code Form is subject to the terms of the Mozilla Public
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -5366,7 +5367,7 @@ diff --git a/suite/mailnews/content/mailOverlay.xhtml b/suite/mailnews/content/m
 diff --git a/suite/mailnews/content/mailTasksOverlay.js b/suite/mailnews/content/mailTasksOverlay.js
 --- a/suite/mailnews/content/mailTasksOverlay.js
 +++ b/suite/mailnews/content/mailTasksOverlay.js
-@@ -20,27 +20,27 @@ const BIFF_STATE_UNKNOWN    = "UnknownMa
+@@ -21,27 +21,27 @@ const BIFF_STATE_UNKNOWN    = "UnknownMa
  function toMessengerWindow()
  {
    toOpenWindowByType("mail:3pane", "chrome://messenger/content/");
@@ -5396,7 +5397,7 @@ diff --git a/suite/mailnews/content/mailTasksOverlay.js b/suite/mailnews/content
                                                     aPOP3DownloadServersArray,
                                                     aLocalFoldersToDownloadTo)
  {
-@@ -232,13 +232,13 @@ nsMsgBadCertHandler.prototype = {
+@@ -233,13 +233,13 @@ nsMsgBadCertHandler.prototype = {
  };
  
  function InformUserOfCertError(status, targetSite)
@@ -5414,7 +5415,7 @@ diff --git a/suite/mailnews/content/mailTasksOverlay.js b/suite/mailnews/content
 diff --git a/suite/mailnews/content/mailViewList.js b/suite/mailnews/content/mailViewList.js
 --- a/suite/mailnews/content/mailViewList.js
 +++ b/suite/mailnews/content/mailViewList.js
-@@ -92,17 +92,17 @@ function RefreshListView(aSelectedMailVi
+@@ -91,17 +91,17 @@ function RefreshListView(aSelectedMailVi
      gListBox.appendItem(mailView.prettyName, index);
      if (aSelectedMailView && (mailView.prettyName == aSelectedMailView.prettyName))
        gListBox.selectedIndex = index;
@@ -5433,7 +5434,7 @@ diff --git a/suite/mailnews/content/mailViewList.js b/suite/mailnews/content/mai
  function OnDeleteMailView()
  {
    let bundle = Services.strings.createBundle("chrome://messenger/locale/messenger.properties");
-@@ -138,17 +138,17 @@ function OnEditMailView()
+@@ -137,17 +137,17 @@ function OnEditMailView()
  {
    // get the selected index
    var selectedIndex = gListBox.selectedIndex;
@@ -5521,7 +5522,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
-@@ -1351,17 +1351,17 @@ function MsgOpenFromFile() {
+@@ -1350,17 +1350,17 @@ function MsgOpenFromFile() {
  
    fp.open(rv => {
      if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
@@ -5540,7 +5541,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)
-@@ -1496,17 +1496,17 @@ function MsgOpenNewWindowForMessage(mess
+@@ -1495,17 +1495,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 +5560,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function MsgJunk() {
-@@ -1536,17 +1536,17 @@ function MsgMarkMsgAsRead(read) {
+@@ -1535,17 +1535,17 @@ function MsgMarkMsgAsRead(read) {
    MarkSelectedMessagesRead(read);
  }
  
@@ -5578,7 +5579,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    let folders = GetSelectedMsgFolders();
    for (let folder of folders)
      folder.markAllMessagesRead(msgWindow);
-@@ -1616,17 +1616,17 @@ function MsgMarkAllFoldersRead() {
+@@ -1615,17 +1615,17 @@ function MsgMarkAllFoldersRead() {
  
  function MsgFilters(emailAddress, folder) {
    if (!folder)
@@ -5597,7 +5598,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);
-@@ -1766,17 +1766,17 @@ function MsgSendUnsentMsgs() {
+@@ -1765,17 +1765,17 @@ function MsgSendUnsentMsgs() {
  
  function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
    var messageList = gFolderDisplay.selectedMessageUris;
@@ -5616,7 +5617,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint() {
-@@ -1854,17 +1854,17 @@ function getMessageBrowser() {
+@@ -1853,17 +1853,17 @@ function getMessageBrowser() {
  // The zoom manager, view source and possibly some other functions still rely
  // on the getBrowser function.
  function getBrowser() {
@@ -5635,7 +5636,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2619,17 +2619,17 @@ function IgnoreMDNResponse() {
+@@ -2618,17 +2618,17 @@ function IgnoreMDNResponse() {
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5654,7 +5655,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        return;
      Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
  
-@@ -2639,26 +2639,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2638,26 +2638,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -6011,7 +6012,7 @@ diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
 diff --git a/suite/mailnews/modules/MailUtils.js b/suite/mailnews/modules/MailUtils.js
 --- a/suite/mailnews/modules/MailUtils.js
 +++ b/suite/mailnews/modules/MailUtils.js
-@@ -86,14 +86,14 @@ var MailUtils =
+@@ -87,14 +87,14 @@ var MailUtils =
    openMessageInNewWindow: function MailUtils_openMessageInNewWindow(aMsgHdr)
    {
      // Pass in the message URI as messageWindow.js doesn't handle message headers