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 1586340385 14400
-#      Wed Apr 08 06:06:25 2020 -0400
-# Node ID 82d67e29ad0f1551d2cacb02f2bd4819ecc6731e
-# Parent  82f46f9e58436c2cfbe149b526e6b2f992ce5b91
+# Date 1592385959 14400
+#      Wed Jun 17 05:25:59 2020 -0400
+# Node ID 8bbfe034205faa1e4c3ab59d41379dfc963f5b65
+# Parent  9cd3ab1b48cccee9d07043e12ad108e2774eb6e1
 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
@@ -437,7 +437,7 @@ diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoom
 diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 --- a/suite/base/jar.mn
 +++ b/suite/base/jar.mn
-@@ -3,96 +3,96 @@
+@@ -3,95 +3,95 @@
  # 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/.comm.jar:
@@ -561,7 +561,6 @@ diff --git a/suite/base/jar.mn b/suite/base/jar.mn
 +   content/communicator/helpEditorOverlay.xhtml                     (content/helpEditorOverlay.xhtml)
 +   content/communicator/helpMessengerOverlay.xhtml                  (content/helpMessengerOverlay.xhtml)
 +   content/communicator/helpSecurityOverlay.xhtml                   (content/helpSecurityOverlay.xhtml)
-    content/communicator/labelsencodings.properties                  (/dom/encoding/labelsencodings.properties)
  # the following file is a suite-specific override of the generic license.html, using suite/common/app-license.html as input:
  *  content/communicator/license.html                                (/toolkit/content/license.html)
     content/communicator/nsContextMenu.js                            (content/nsContextMenu.js)
@@ -5197,7 +5196,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
-@@ -1493,17 +1493,17 @@ function MsgOpenFromFile()
+@@ -1486,17 +1486,17 @@ function MsgOpenFromFile()
  
    fp.open(rv => {
      if (rv != nsIFilePicker.returnOK || !fp.file) {
@@ -5216,7 +5215,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  {
    var uriToOpen = uri;
    var keyToSelect = key;
-@@ -1643,17 +1643,17 @@ function MsgOpenNewWindowForMessage(mess
+@@ -1636,17 +1636,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
@@ -5235,7 +5234,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
    window.close();
  }
  
-@@ -1676,17 +1676,17 @@ function MsgMarkAsFlagged(markFlagged)
+@@ -1669,17 +1669,17 @@ function MsgMarkAsFlagged(markFlagged)
      if (!markFlagged) {
          markFlagged = !SelectedMessagesAreFlagged();
      }
@@ -5254,7 +5253,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  {
    var folder = GetSelectedMsgFolders()[0];
  
-@@ -1769,17 +1769,17 @@ function MsgFilters(emailAddress, folder
+@@ -1761,17 +1761,17 @@ function MsgFilters(emailAddress, folder
  {
      if (!folder)
        folder = GetFirstSelectedMsgFolder();
@@ -5273,7 +5272,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
        {
           args = { refresh: true, folder: folder };
           MsgFilterList(args);
-@@ -1976,17 +1976,17 @@ function PrintEnginePrintInternal(aDoPri
+@@ -1964,17 +1964,17 @@ function PrintEnginePrintInternal(aDoPri
  {
    var messageList = gFolderDisplay.selectedMessageUris;
    if (!messageList)
@@ -5292,7 +5291,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  }
  
  function PrintEnginePrint()
-@@ -2101,17 +2101,17 @@ function getMessageBrowser()
+@@ -2089,17 +2089,17 @@ function getMessageBrowser()
  function getBrowser()
  {
    return GetTabMail() ? GetTabMail().getBrowserForSelectedTab() :
@@ -5311,7 +5310,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
  function MsgUpdateMsgCount() {}
  function MsgImport() {}
  function MsgSynchronize() {}
-@@ -2932,17 +2932,17 @@ function IgnoreMDNResponse()
+@@ -2917,17 +2917,17 @@ function IgnoreMDNResponse()
   * chosen.
   *
   * @param [aFolder] the folder to open the search window for, if different from
@@ -5330,7 +5329,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);
-@@ -2955,28 +2955,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
+@@ -2940,28 +2940,28 @@ function MsgJunkMailInfo(aCheckFirstUse)
        return;
    }
  
@@ -5447,6 +5446,25 @@ 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">
+@@ -1840,17 +1840,17 @@
+       <button id="button-advanced"
+               label="&advancedButton.label;"
+               accesskey="&advancedButton.accesskey;"
+               tooltiptext="&advancedButton.tooltip;"
+               observes="button_search"
+               oncommand="goDoCommand('button_search')"/>
+     </toolbaritem>
+     <toolbaritem id="throbber-box"/>
+-    <!-- see utilityOverlay.xul
++    <!-- see utilityOverlay.xhtml
+     <toolbarbutton id="sync-button"/> -->
+   </toolbarpalette>
+ 
+ </toolbox>
+ 
+ <statusbar class="chromeclass-status" id="status-bar">
+   <statusbarpanel id="component-bar"/>
+   <statusbarpanel id="statusText" label="&statusText.label;" crop="right" flex="1"/>
 diff --git a/suite/mailnews/content/messageWindow.xhtml b/suite/mailnews/content/messageWindow.xhtml
 --- a/suite/mailnews/content/messageWindow.xhtml
 +++ b/suite/mailnews/content/messageWindow.xhtml