Browse Source

Rebase after checkin

Frank-Rainer Grahl 1 year ago
parent
commit
0926a502b9

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

@@ -3,7 +3,7 @@
 # Date 1687859748 14400
 # Date 1687859748 14400
 #      Tue Jun 27 05:55:48 2023 -0400
 #      Tue Jun 27 05:55:48 2023 -0400
 # Node ID cef48c3d22fb9a94394198886d4ff4076f4f238f
 # Node ID cef48c3d22fb9a94394198886d4ff4076f4f238f
-# Parent  344558f0709403856bb5c5f9b58652db1bcdb07c
+# Parent  a0bbe603ee0cf2ad12a5d20396b63b4b33be7974
 Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
 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
 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.mail",                false);
  pref("general.startup.news",                false);
  pref("general.startup.news",                false);
  pref("general.startup.editor",              false);
  pref("general.startup.editor",              false);
-@@ -744,18 +744,18 @@ pref("privacy.clearOnShutdown.siteSettin
+@@ -750,18 +750,18 @@ pref("privacy.clearOnShutdown.siteSettin
  pref("privacy.warn_tracking_content", true);
  pref("privacy.warn_tracking_content", true);
  
  
  // Switching this on will also spoof our user agent and other potentially
  // Switching this on will also spoof our user agent and other potentially

+ 3 - 3
comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1,7 +1,7 @@
 # HG changeset patch
 # HG changeset patch
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # User Ian Neal <iann_cvs@blueyonder.co.uk>
 # Date 1581435120 -3600
 # Date 1581435120 -3600
-# Parent  5a097e3bb4587cbe5f1cf058c686faf235130772
+# Parent  d9425987ce5e12053e9f13e277a18b24a1c46b98
 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
 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
 diff --git a/suite/base/content/viewZoomOverlay.js b/suite/base/content/viewZoomOverlay.js
@@ -438,7 +438,7 @@ diff --git a/suite/components/console/jsconsole-clhandler.js b/suite/components/
 diff --git a/suite/components/dataman/content/dataman.js b/suite/components/dataman/content/dataman.js
 diff --git a/suite/components/dataman/content/dataman.js b/suite/components/dataman/content/dataman.js
 --- a/suite/components/dataman/content/dataman.js
 --- a/suite/components/dataman/content/dataman.js
 +++ b/suite/components/dataman/content/dataman.js
 +++ b/suite/components/dataman/content/dataman.js
-@@ -118,18 +118,18 @@ var gDataman = {
+@@ -119,18 +119,18 @@ var gDataman = {
    },
    },
  
  
    debugError: function dataman_debugError(aLogMessage) {
    debugError: function dataman_debugError(aLogMessage) {
@@ -802,7 +802,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
   * simple permission prompts when content requests additional
   * simple permission prompts when content requests additional
   * capabilities.
   * capabilities.
   *
   *
-@@ -1618,17 +1618,17 @@ var ContentPermissionIntegration = {
+@@ -1616,17 +1616,17 @@ var ContentPermissionIntegration = {
    },
    },
  };
  };