rebase after pushes

comm-central/patches/TOP-1611010-DOMEventListener-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1579738200 -3600
-# Parent  85ae41d14d153ec919a86b6deddac091696a070b
+# Parent  3e95b3f0d9b249d0df2418a5a007adc82060fae9
 Bug 1611010 - Port |Bug 1453345 part 5 - Remove pointless JS implementaions of QI to nsIDOMEventListener| and |Bug 1453487 part 2 - Remove useless implements="nsIDOMEventListener" from XBL bindings| to SeaMonkey. r=frg
 
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -387,7 +387,7 @@ diff --git a/suite/components/places/content/places.js b/suite/components/places
 diff --git a/suite/components/pref/content/pref-applications.js b/suite/components/pref/content/pref-applications.js
 --- a/suite/components/pref/content/pref-applications.js
 +++ b/suite/components/pref/content/pref-applications.js
-@@ -877,18 +877,17 @@ var gApplicationsPane = {
+@@ -759,35 +759,34 @@ var gApplicationsPane = {
      Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
      Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
    },
@@ -407,7 +407,6 @@ diff --git a/suite/components/pref/content/pref-applications.js b/suite/componen
      // Rebuild the list when there are changes to preferences that influence
      // whether or not to show certain entries in the list.
      if (aTopic == "nsPref:changed" && !this._storingAction) {
-@@ -903,17 +902,17 @@ var gApplicationsPane = {
        // All the prefs we observe can affect what we display, so we rebuild
        // the view when any of them changes.
        this._rebuildView();

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  3b2d15d665c735d40769e793b321b02463bf1561
+# Parent  2ec69e9396cdfafff131cd6df15e08a00a980e6c
 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
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
  pref("general.startup.mail",                false);
  pref("general.startup.news",                false);
  pref("general.startup.editor",              false);
-@@ -749,18 +749,18 @@ pref("privacy.clearOnShutdown.siteSettin
+@@ -746,18 +746,18 @@ pref("privacy.clearOnShutdown.siteSettin
  pref("privacy.warn_tracking_content", true);
  
  // Switching this on will also spoof our user agent and other potentially
@@ -608,7 +608,7 @@ diff --git a/suite/browser/browser-places.js b/suite/browser/browser-places.js
          rows.insertBefore(header, rows.firstChild);
          header.hidden = false;
  
-@@ -513,17 +513,17 @@ var PlacesCommandHook = {
+@@ -512,17 +512,17 @@ var PlacesCommandHook = {
     *                      BookmarksMenu, BookmarksToolbar, UnfiledBookmarks,
     *                      AllBookmarks, History.
     */
@@ -1474,7 +1474,7 @@ diff --git a/suite/chatzilla/xul/content/prefsOverlay.xhtml b/suite/chatzilla/xu
 diff --git a/suite/components/bindings/notification.xml b/suite/components/bindings/notification.xml
 --- a/suite/components/bindings/notification.xml
 +++ b/suite/components/bindings/notification.xml
-@@ -710,17 +710,17 @@
+@@ -500,17 +500,17 @@
              var browserWin;
              var whereToOpen = Services.prefs.getIntPref("browser.link.open_external");
  
@@ -2482,7 +2482,7 @@ diff --git a/suite/components/pref/content/pref-applications.js b/suite/componen
    gApplicationsPane.init();
  }
  
-@@ -1575,17 +1575,17 @@ var gApplicationsPane = {
+@@ -1365,17 +1365,17 @@ var gApplicationsPane = {
          typeItem.setAttribute("appHandlerIcon", "app");
      }
    },
@@ -2501,7 +2501,7 @@ diff --git a/suite/components/pref/content/pref-applications.js b/suite/componen
  
      // update the listitem too. Will be visible when selecting another row
      typeItem.setAttribute("actionDescription",
-@@ -1650,17 +1650,17 @@ var gApplicationsPane = {
+@@ -1440,17 +1440,17 @@ var gApplicationsPane = {
          params.mimeInfo = handlerInfo.wrappedHandlerInfo;
        }
  
@@ -2788,7 +2788,7 @@ diff --git a/suite/components/pref/content/preferences.xhtml b/suite/components/
 +                url="chrome://communicator/content/pref/pref-advanced.xhtml">
          <treechildren id="advancedChildren">
            <treeitem id="scriptsItem"
-                     label="&scriptsAndWindows.label;"
+                     label="&scriptsAndWindows2.label;"
                      prefpane="scripts_pane"
                      helpTopic="advanced_pref_scripts"
 -                    url="chrome://communicator/content/pref/pref-scripts.xul"/>
@@ -3703,8 +3703,8 @@ diff --git a/suite/extensions/debugQA/jar.mn b/suite/extensions/debugQA/jar.mn
 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
+@@ -222,18 +222,18 @@ extensions/modern@themes.mozilla.org/chr
+ chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.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
@@ -3896,8 +3896,8 @@ diff --git a/suite/locales/en-US/chrome/common/pref/pref-scripts.dtd b/suite/loc
 -<!-- extracted from content/pref-scripts.xul -->
 +<!-- extracted from content/pref-scripts.xhtml -->
  
- <!--LOCALIZATION NOTE : FILE The 'Scripts & Plugins' preferences dialog -->
- <!ENTITY pref.scripts.title              "Scripts &amp; Plugins">
+ <!--LOCALIZATION NOTE : FILE The 'Scripts' preferences dialog -->
+ <!ENTITY pref.scripts2.title             "Scripts">
  
  <!ENTITY navigator.label                 "Browser">
  <!ENTITY navigator.accesskey             "B">
@@ -5897,7 +5897,7 @@ diff --git a/suite/mailnews/content/msgViewPickerOverlay.js b/suite/mailnews/con
 diff --git a/suite/mailnews/content/tabmail.js b/suite/mailnews/content/tabmail.js
 --- a/suite/mailnews/content/tabmail.js
 +++ b/suite/mailnews/content/tabmail.js
-@@ -513,17 +513,17 @@ var gMailNewsTabsType =
+@@ -510,17 +510,17 @@ var gMailNewsTabsType =
    },
  
    //
@@ -6101,7 +6101,7 @@ diff --git a/suite/themes/classic/jar.mn b/suite/themes/classic/jar.mn
 diff --git a/suite/themes/classic/mac/navigator/navigator.css b/suite/themes/classic/mac/navigator/navigator.css
 --- a/suite/themes/classic/mac/navigator/navigator.css
 +++ b/suite/themes/classic/mac/navigator/navigator.css
-@@ -842,19 +842,19 @@ toolbar[mode="text"] toolbarbutton.chevr
+@@ -773,19 +773,19 @@ toolbar[mode="text"] toolbarbutton.chevr
  #editBookmarkPanelHeader {
    margin-bottom: 6px;
  }

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  dc81b8c484a5a89786a40a199541eecac688ccf2
+# Parent  c9c2afb3ab56e817efff29c52968206a8f8744e2
 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
@@ -35,7 +35,7 @@ diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoom
 diff --git a/suite/browser/browser-places.js b/suite/browser/browser-places.js
 --- a/suite/browser/browser-places.js
 +++ b/suite/browser/browser-places.js
-@@ -789,17 +789,17 @@ var BookmarkingUI = {
+@@ -788,17 +788,17 @@ var BookmarkingUI = {
        PlacesUtils.bookmarks.removeObserver(this);
      }
  
@@ -336,47 +336,6 @@ diff --git a/suite/browser/test/browser/browser_bug623155.js b/suite/browser/tes
    //onStatusChange: function() {},
    //onProgressChange: function() {},
    //onSecurityChange: function() {},
-diff --git a/suite/browser/test/browser/browser_pluginplaypreview.js b/suite/browser/test/browser/browser_pluginplaypreview.js
---- a/suite/browser/test/browser/browser_pluginplaypreview.js
-+++ b/suite/browser/test/browser/browser_pluginplaypreview.js
-@@ -12,17 +12,17 @@ var gPlayPreviewPluginActualEvents = 0;
- var gPlayPreviewPluginExpectedEvents = 1;
- 
- var gPlayPreviewRegistration = null;
- 
- function registerPlayPreview(mimeType, targetUrl) {
- 
-   function StreamConverterFactory() {}
-   StreamConverterFactory.prototype = {
--    QueryInterface: XPCOMUtils.generateQI([Ci.nsIFactory]),
-+    QueryInterface: ChromeUtils.generateQI([Ci.nsIFactory]),
-     _targetConstructor: null,
- 
-     register: function register(targetConstructor) {
-       this._targetConstructor = targetConstructor;
-       var proto = targetConstructor.prototype;
-       var registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar);
-       registrar.registerFactory(proto.classID, proto.classDescription,
-                                 proto.contractID, this);
-@@ -46,17 +46,17 @@ function registerPlayPreview(mimeType, t
-     lockFactory: function lockFactory(lock) {
-       // No longer used as of gecko 1.7.
-       throw Cr.NS_ERROR_NOT_IMPLEMENTED;
-     }
-   };
- 
-   function OverlayStreamConverter() {}
-   OverlayStreamConverter.prototype = {
--    QueryInterface: XPCOMUtils.generateQI([
-+    QueryInterface: ChromeUtils.generateQI([
-         Ci.nsIStreamConverter,
-         Ci.nsIStreamListener,
-         Ci.nsIRequestObserver
-     ]),
- 
-     classID: Components.ID('{4c6030f7-e20a-264f-0f9b-ada3a9e97384}'),
-     classDescription: 'overlay-test-data Component',
-     contractID: '@mozilla.org/streamconv;1?from=application/x-moz-playpreview&to=*/*',
 diff --git a/suite/components/bindings/findbar.xml b/suite/components/bindings/findbar.xml
 --- a/suite/components/bindings/findbar.xml
 +++ b/suite/components/bindings/findbar.xml
@@ -410,7 +369,7 @@ diff --git a/suite/components/bindings/findbar.xml b/suite/components/bindings/f
 diff --git a/suite/components/bindings/notification.xml b/suite/components/bindings/notification.xml
 --- a/suite/components/bindings/notification.xml
 +++ b/suite/components/bindings/notification.xml
-@@ -2124,18 +2124,19 @@
+@@ -1581,18 +1581,19 @@
                  optInCB.checked = Services.prefs.getBoolPref("dom.ipc.plugins.reportCrashURL");
              }
  
@@ -1375,7 +1334,7 @@ diff --git a/suite/components/places/tests/unit/test_browserGlue_smartBookmarks.
 diff --git a/suite/components/pref/content/pref-applications.js b/suite/components/pref/content/pref-applications.js
 --- a/suite/components/pref/content/pref-applications.js
 +++ b/suite/components/pref/content/pref-applications.js
-@@ -516,17 +516,17 @@ FeedHandlerInfo.prototype = {
+@@ -402,17 +402,17 @@ FeedHandlerInfo.prototype = {
  
      // A minimal implementation of nsIMutableArray.  It only supports the two
      // methods its callers invoke, namely appendElement, nsIArray::enumerate
@@ -1394,7 +1353,7 @@ diff --git a/suite/components/pref/content/pref-applications.js b/suite/componen
        enumerate: function() {
          return new ArrayEnumerator(this._inner);
        },
-@@ -877,17 +877,17 @@ var gApplicationsPane = {
+@@ -759,17 +759,17 @@ var gApplicationsPane = {
      Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_WEB, this);
      Services.prefs.removeObserver(PREF_AUDIO_FEED_SELECTED_ACTION, this);
    },