rebase

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 1614281942 18000
-#      Thu Feb 25 14:39:02 2021 -0500
-# Node ID bb393fb8c191edfbc49148ee98ac937bf9a9db6f
-# Parent  9bf652d9de1e91775403e4b2a056b098f03699d0
+# Date 1626813122 14400
+#      Tue Jul 20 16:32:02 2021 -0400
+# Node ID 1de38ba2521de8b67e9c4a651c27bccd08770286
+# Parent  c101a951178228b2e7072827a64e2d1cf8d21196
 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
@@ -3728,6 +3728,30 @@ diff --git a/suite/extensions/debugQA/jar.mn b/suite/extensions/debugQA/jar.mn
 +  content/debugqa/debugQANavigatorOverlay.xhtml           (content/debugQANavigatorOverlay.xhtml)
 +  content/debugqa/debugQATextEditorShell.xhtml            (content/debugQATextEditorShell.xhtml)
    content/debugqa/EditorInitPage.html                     (content/EditorInitPage.html)
+diff --git a/suite/installer/allowed-dupes.mn b/suite/installer/allowed-dupes.mn
+--- a/suite/installer/allowed-dupes.mn
++++ b/suite/installer/allowed-dupes.mn
+@@ -224,18 +224,18 @@ extensions/modern@themes.mozilla.org/chr
+ chrome/classic/skin/classic/navigator/click-to-play-warning-stripes.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/category-dictionaries.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/mozapps/extensions/dictionaryGeneric.png
+ chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/messenger/icons/new-mail-alert.png
+ chrome/classic/skin/classic/messenger/icons/new-mail-alert.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/navigator/webDeveloper.css
+ chrome/classic/skin/classic/navigator/webDeveloper.css
+-chrome/comm/content/communicator/places/bookmarkProperties.xul
+-chrome/comm/content/communicator/places/bookmarkProperties2.xul
++chrome/comm/content/communicator/places/bookmarkProperties.xhtml
++chrome/comm/content/communicator/places/bookmarkProperties2.xhtml
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/audioFeedIcon.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/feedIcon.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/icons/videoFeedIcon.png
+ chrome/classic/skin/classic/communicator/icons/audioFeedIcon.png
+ chrome/classic/skin/classic/communicator/icons/feedIcon.png
+ chrome/classic/skin/classic/communicator/icons/videoFeedIcon.png
+ extensions/modern@themes.mozilla.org/chrome/modern/skin/modern/communicator/brand/throbber-single.png
+ chrome/classic/skin/classic/communicator/brand/throbber-single.png
 diff --git a/suite/locales/en-US/chrome/browser/navigator.dtd b/suite/locales/en-US/chrome/browser/navigator.dtd
 --- a/suite/locales/en-US/chrome/browser/navigator.dtd
 +++ b/suite/locales/en-US/chrome/browser/navigator.dtd
@@ -5066,7 +5090,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
-@@ -1721,17 +1721,17 @@ var gFolderTreeController = {
+@@ -1722,17 +1722,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
@@ -5085,7 +5109,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
    },
  
    /**
-@@ -1796,17 +1796,17 @@ var gFolderTreeController = {
+@@ -1797,17 +1797,17 @@ var gFolderTreeController = {
        // context menu on a non-loaded folder).
        if (msgFolder == GetLoadedMsgFolder()) {
          gRerootOnFolderLoad = true;
@@ -5104,7 +5128,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
                         rebuildSummaryCallback: rebuildSummary});
    },
  
-@@ -1827,17 +1827,17 @@ var gFolderTreeController = {
+@@ -1828,17 +1828,17 @@ var gFolderTreeController = {
  
        controller._resetThreadPane();
        let folderTree = document.getElementById("folderTree");
@@ -5123,7 +5147,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.
-@@ -1986,17 +1986,17 @@ var gFolderTreeController = {
+@@ -1987,17 +1987,17 @@ var gFolderTreeController = {
      let folder = aParent || GetSelectedMsgFolders()[0];
      if (!folder)
        folder = GetDefaultAccountRootFolder();
@@ -5142,7 +5166,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
     *
-@@ -2008,17 +2008,17 @@ var gFolderTreeController = {
+@@ -2009,17 +2009,17 @@ var gFolderTreeController = {
      function editVirtualCallback(aURI) {
        // we need to reload the folder if it is the currently loaded folder...
        if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {
@@ -5519,7 +5543,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
-@@ -1472,17 +1472,17 @@ function MsgOpenFromFile()
+@@ -1474,17 +1474,17 @@ function MsgOpenFromFile()
  
    fp.open(rv => {
      if (rv != nsIFilePicker.returnOK || !fp.file) {
@@ -5538,7 +5562,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)
-@@ -1622,17 +1622,17 @@ function MsgOpenNewWindowForMessage(mess
+@@ -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
@@ -5557,7 +5581,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    window.close();
  }
  
-@@ -1666,17 +1666,17 @@ function MsgMarkMsgAsRead(read) {
+@@ -1668,17 +1668,17 @@ function MsgMarkMsgAsRead(read) {
  
  function MsgMarkAsFlagged()
  {
@@ -5576,7 +5600,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  {
    let folders = GetSelectedMsgFolders();
    for (let folder of folders)
-@@ -1757,17 +1757,17 @@ function MsgFilters(emailAddress, folder
+@@ -1759,17 +1759,17 @@ function MsgFilters(emailAddress, folder
  {
      if (!folder)
        folder = GetFirstSelectedMsgFolder();
@@ -5595,7 +5619,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        {
           args = { refresh: true, folder: folder };
           MsgFilterList(args);
-@@ -1929,17 +1929,17 @@ function PrintEnginePrintInternal(aDoPri
+@@ -1931,17 +1931,17 @@ function PrintEnginePrintInternal(aDoPri
  {
    var messageList = gFolderDisplay.selectedMessageUris;
    if (!messageList)
@@ -5614,7 +5638,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint()
-@@ -2047,17 +2047,17 @@ function getMessageBrowser()
+@@ -2049,17 +2049,17 @@ function getMessageBrowser()
  function getBrowser()
  {
    return GetTabMail() ? GetTabMail().getBrowserForSelectedTab() :
@@ -5633,7 +5657,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2885,17 +2885,17 @@ function IgnoreMDNResponse()
+@@ -2887,17 +2887,17 @@ function IgnoreMDNResponse()
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5652,7 +5676,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);
-@@ -2906,28 +2906,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2908,28 +2908,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5935,13 +5959,13 @@ diff --git a/suite/mailnews/jar.mn b/suite/mailnews/jar.mn
 -% overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
 -% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul
 -% overlay chrome://editor/content/composerOverlay.xul                          chrome://messenger/content/mailEditorOverlay.xul
-+% overlay chrome://communicator/content/pref/preferences.xhtml                   chrome://messenger/content/mailPrefsOverlay.xhtml
-+% overlay chrome://communicator/content/pref/pref-appearance.xhtml               chrome://messenger/content/mailPrefsOverlay.xhtml
-+% overlay chrome://communicator/content/pref/pref-scripts.xhtml                  chrome://messenger/content/mailPrefsOverlay.xhtml
-+% overlay chrome://communicator/content/pref/pref-cookies.xhtml                  chrome://messenger/content/mailPrefsOverlay.xhtml
-+% overlay chrome://editor/content/editorTasksOverlay.xhtml                       chrome://messenger/content/mailTasksOverlay.xhtml
-+% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xhtml   chrome://messenger/content/mailOverlay.xhtml
-+% overlay chrome://editor/content/composerOverlay.xhtml                          chrome://messenger/content/mailEditorOverlay.xhtml
++% overlay chrome://communicator/content/pref/preferences.xhtml                 chrome://messenger/content/mailPrefsOverlay.xhtml
++% overlay chrome://communicator/content/pref/pref-appearance.xhtml             chrome://messenger/content/mailPrefsOverlay.xhtml
++% overlay chrome://communicator/content/pref/pref-scripts.xhtml                chrome://messenger/content/mailPrefsOverlay.xhtml
++% overlay chrome://communicator/content/pref/pref-cookies.xhtml                chrome://messenger/content/mailPrefsOverlay.xhtml
++% overlay chrome://editor/content/editorTasksOverlay.xhtml                     chrome://messenger/content/mailTasksOverlay.xhtml
++% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xhtml chrome://messenger/content/mailOverlay.xhtml
++% overlay chrome://editor/content/composerOverlay.xhtml                        chrome://messenger/content/mailEditorOverlay.xhtml
      content/messenger/browserRequest.js                                        (content/browserRequest.js)
 -    content/messenger/browserRequest.xul                                       (content/browserRequest.xul)
 +    content/messenger/browserRequest.xhtml                                     (content/browserRequest.xhtml)