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 1687859748 14400
-#      Tue Jun 27 05:55:48 2023 -0400
-# Node ID cef48c3d22fb9a94394198886d4ff4076f4f238f
-# Parent  a0bbe603ee0cf2ad12a5d20396b63b4b33be7974
+# Date 1697712739 14400
+#      Thu Oct 19 06:52:19 2023 -0400
+# Node ID aa370e119f11ae9c6df0dcd87822ab665f63193e
+# Parent  3042ab3aed3be0a36023606580ccedd6bb018ba9
 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
@@ -1942,7 +1942,7 @@ diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
 diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
 --- a/suite/components/nsSuiteGlue.js
 +++ b/suite/components/nsSuiteGlue.js
-@@ -82,17 +82,17 @@ const BOOKMARKS_BACKUP_IDLE_TIME_SEC = 1
+@@ -86,17 +86,17 @@ const BOOKMARKS_BACKUP_IDLE_TIME_SEC = 1
  // per interval.
  const BOOKMARKS_BACKUP_MIN_INTERVAL_DAYS = 1;
  
@@ -1961,7 +1961,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
  // Constructor
  function SuiteGlue() {
    XPCOMUtils.defineLazyServiceGetter(this, "_idleService",
-@@ -193,17 +193,17 @@ SuiteGlue.prototype = {
+@@ -197,17 +197,17 @@ SuiteGlue.prototype = {
           // the UI has gone should be finalized in _onQuitApplicationGranted.
          this._dispose();
          break;
@@ -1980,7 +1980,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
          break;
        case "final-ui-startup":
          this._onProfileStartup();
-@@ -380,17 +380,17 @@ SuiteGlue.prototype = {
+@@ -384,17 +384,17 @@ SuiteGlue.prototype = {
      }
    },
  
@@ -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()
    {
-@@ -826,17 +826,17 @@ SuiteGlue.prototype = {
+@@ -830,17 +830,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);
    },
-@@ -1030,17 +1030,17 @@ SuiteGlue.prototype = {
+@@ -1034,17 +1034,17 @@ SuiteGlue.prototype = {
      if (ShellService) try {
        var appTypes = ShellService.shouldBeDefaultClientFor;
  

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

@@ -777,7 +777,7 @@ diff --git a/suite/components/nsGopherProtocolStubHandler.js b/suite/components/
 diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
 --- a/suite/components/nsSuiteGlue.js
 +++ b/suite/components/nsSuiteGlue.js
-@@ -1558,20 +1558,20 @@ SuiteGlue.prototype = {
+@@ -1562,20 +1562,20 @@ SuiteGlue.prototype = {
      } catch (e) {
        Cu.reportError("Error displaying tab received by Sync: " + e);
      }
@@ -802,7 +802,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
   * simple permission prompts when content requests additional
   * capabilities.
   *
-@@ -1616,17 +1616,17 @@ var ContentPermissionIntegration = {
+@@ -1620,17 +1620,17 @@ var ContentPermissionIntegration = {
    },
  };