|
@@ -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 1722958930 -3600
|
|
# Date 1722958930 -3600
|
|
-# Parent 10570b925d980dda342217912d387f232748e153
|
|
|
|
|
|
+# Parent 5d3bb4ba92fc8c0972f812828bbc589d29541dbd
|
|
Bug 1911841 - Port changes needed from |Bug 1476333 - Consolidate the ways that we reference "browser.xul" across the tree| to SeaMonkey. r=frg a=frg
|
|
Bug 1911841 - Port changes needed from |Bug 1476333 - Consolidate the ways that we reference "browser.xul" across the tree| to SeaMonkey. r=frg a=frg
|
|
|
|
|
|
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
|
|
@@ -28,7 +28,25 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOverlay.js
|
|
diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOverlay.js
|
|
--- a/suite/base/content/utilityOverlay.js
|
|
--- a/suite/base/content/utilityOverlay.js
|
|
+++ b/suite/base/content/utilityOverlay.js
|
|
+++ b/suite/base/content/utilityOverlay.js
|
|
-@@ -209,24 +209,17 @@ function setOfflineUI(offline)
|
|
|
|
|
|
+@@ -5,16 +5,17 @@
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Communicator Shared Utility Library
|
|
|
|
+ * for shared application glue for the Communicator suite of applications
|
|
|
|
+ **/
|
|
|
|
+
|
|
|
|
+ ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
+ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
|
|
|
++ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
|
|
+
|
|
|
|
+ XPCOMUtils.defineLazyModuleGetters(this, {
|
|
|
|
+ BrowserUtils: "resource://gre/modules/BrowserUtils.jsm",
|
|
|
|
+ PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
|
|
|
|
+ RecentWindow: "resource:///modules/RecentWindow.jsm",
|
|
|
|
+ });
|
|
|
|
+
|
|
|
|
+ // XPCOMUtils.defineLazyGetter(this, "Weave", function() {
|
|
|
|
+@@ -209,24 +210,17 @@ function setOfflineUI(offline)
|
|
broadcaster.removeAttribute("offline");
|
|
broadcaster.removeAttribute("offline");
|
|
broadcaster.removeAttribute("checked");
|
|
broadcaster.removeAttribute("checked");
|
|
panel.setAttribute("context", "networkProperties");
|
|
panel.setAttribute("context", "networkProperties");
|
|
@@ -57,7 +75,22 @@ diff --git a/suite/base/content/utilityOverlay.js b/suite/base/content/utilityOv
|
|
diff --git a/suite/browser/nsBrowserContentHandler.js b/suite/browser/nsBrowserContentHandler.js
|
|
diff --git a/suite/browser/nsBrowserContentHandler.js b/suite/browser/nsBrowserContentHandler.js
|
|
--- a/suite/browser/nsBrowserContentHandler.js
|
|
--- a/suite/browser/nsBrowserContentHandler.js
|
|
+++ b/suite/browser/nsBrowserContentHandler.js
|
|
+++ b/suite/browser/nsBrowserContentHandler.js
|
|
-@@ -165,21 +165,17 @@ function openPreferences()
|
|
|
|
|
|
+@@ -1,13 +1,14 @@
|
|
|
|
+ /* 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/. */
|
|
|
|
+
|
|
|
|
+ ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
++ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
|
|
+
|
|
|
|
+ const nsISupports = Ci.nsISupports;
|
|
|
|
+ const nsIBrowserDOMWindow = Ci.nsIBrowserDOMWindow;
|
|
|
|
+ const nsIBrowserHistory = Ci.nsIBrowserHistory;
|
|
|
|
+ const nsIBrowserSearchService = Ci.nsIBrowserSearchService;
|
|
|
|
+ const nsIChannel = Ci.nsIChannel;
|
|
|
|
+ const nsICommandLine = Ci.nsICommandLine;
|
|
|
|
+ const nsICommandLineHandler = Ci.nsICommandLineHandler;
|
|
|
|
+@@ -164,21 +165,17 @@ function openPreferences()
|
|
win.focus();
|
|
win.focus();
|
|
else
|
|
else
|
|
openWindow(null, "chrome://communicator/content/pref/preferences.xul",
|
|
openWindow(null, "chrome://communicator/content/pref/preferences.xul",
|
|
@@ -133,7 +166,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
diff --git a/suite/components/places/PlacesUIUtils.jsm b/suite/components/places/PlacesUIUtils.jsm
|
|
diff --git a/suite/components/places/PlacesUIUtils.jsm b/suite/components/places/PlacesUIUtils.jsm
|
|
--- a/suite/components/places/PlacesUIUtils.jsm
|
|
--- a/suite/components/places/PlacesUIUtils.jsm
|
|
+++ b/suite/components/places/PlacesUIUtils.jsm
|
|
+++ b/suite/components/places/PlacesUIUtils.jsm
|
|
-@@ -914,17 +914,17 @@ var PlacesUIUtils = {
|
|
|
|
|
|
+@@ -916,17 +916,17 @@ var PlacesUIUtils = {
|
|
browserWindow.whereToOpenLink(aEvent, false, true) : "window";
|
|
browserWindow.whereToOpenLink(aEvent, false, true) : "window";
|
|
if (where == "window") {
|
|
if (where == "window") {
|
|
// There is no browser window open, thus open a new one.
|
|
// There is no browser window open, thus open a new one.
|
|
@@ -241,7 +274,7 @@ diff --git a/suite/components/sidebar/content/sidebarOverlay.js b/suite/componen
|
|
diff --git a/suite/confvars.sh b/suite/confvars.sh
|
|
diff --git a/suite/confvars.sh b/suite/confvars.sh
|
|
--- a/suite/confvars.sh
|
|
--- a/suite/confvars.sh
|
|
+++ b/suite/confvars.sh
|
|
+++ b/suite/confvars.sh
|
|
-@@ -7,16 +7,18 @@ MOZ_APP_BASENAME=SeaMonkey
|
|
|
|
|
|
+@@ -6,16 +6,18 @@
|
|
MOZ_APP_VENDOR=Mozilla
|
|
MOZ_APP_VENDOR=Mozilla
|
|
MOZ_APP_NAME=seamonkey
|
|
MOZ_APP_NAME=seamonkey
|
|
MOZ_APP_DISPLAYNAME=SeaMonkey
|
|
MOZ_APP_DISPLAYNAME=SeaMonkey
|