|
|
@@ -303,44 +303,59 @@ diff --git a/suite/components/components.conf b/suite/components/components.conf
|
|
|
new file mode 100644
|
|
|
--- /dev/null
|
|
|
+++ b/suite/components/components.conf
|
|
|
-@@ -0,0 +1,37 @@
|
|
|
-+# HG changeset patch
|
|
|
-+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
-+# Date 1659988365 0
|
|
|
-+Bug 1783623 - Convert suite binary components registration to components.conf.
|
|
|
-+Port Bug 1524687 Part 11 to suite.
|
|
|
+@@ -0,0 +1,27 @@
|
|
|
++# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
|
++# vim: set filetype=python:
|
|
|
++# 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/.
|
|
|
++
|
|
|
++pages = [
|
|
|
++ 'blocked',
|
|
|
++ 'certerror',
|
|
|
++ 'data',
|
|
|
++ 'feeds',
|
|
|
++ 'life',
|
|
|
++ 'newserror',
|
|
|
++ 'privatebrowsing',
|
|
|
++ 'rights',
|
|
|
++ 'sessionrestore',
|
|
|
++]
|
|
|
++
|
|
|
++Classes = [
|
|
|
++ {
|
|
|
++ 'cid': '{d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}',
|
|
|
++ 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=%s' % page
|
|
|
++ for page in pages],
|
|
|
++ "jsm": "resource:///modules/AboutRedirector.jsm",
|
|
|
++ 'constructor': 'AboutRedirector',
|
|
|
++ },
|
|
|
++]
|
|
|
+diff --git a/suite/components/moz.build b/suite/components/moz.build
|
|
|
+--- a/suite/components/moz.build
|
|
|
++++ b/suite/components/moz.build
|
|
|
+@@ -40,13 +40,20 @@ MOCHITEST_CHROME_MANIFESTS += [
|
|
|
+
|
|
|
+ XPIDL_SOURCES += [
|
|
|
+ "nsISuiteGlue.idl",
|
|
|
+ ]
|
|
|
+
|
|
|
+ XPIDL_MODULE = "suite-components"
|
|
|
+
|
|
|
+ EXTRA_COMPONENTS += [
|
|
|
+- "nsAbout.js",
|
|
|
+ "nsGopherProtocolStubHandler.js",
|
|
|
+ "nsSuiteGlue.js",
|
|
|
+ "SuiteComponents.manifest",
|
|
|
+ ]
|
|
|
+
|
|
|
-+diff --git a/suite/components/components.conf b/suite/components/components.conf
|
|
|
-+new file mode 100644
|
|
|
-+--- /dev/null
|
|
|
-++++ b/suite/components/components.conf
|
|
|
-+@@ -0,0 +1,26 @@
|
|
|
-++# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
|
|
-++# vim: set filetype=python:
|
|
|
-++# 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/.
|
|
|
-++
|
|
|
-++pages = [
|
|
|
-++ 'blocked',
|
|
|
-++ 'certerror',
|
|
|
-++ 'data',
|
|
|
-++ 'feeds',
|
|
|
-++ 'life',
|
|
|
-++ 'newserror',
|
|
|
-++ 'privatebrowsing',
|
|
|
-++ 'rights',
|
|
|
-++ 'sessionrestore',
|
|
|
-++]
|
|
|
-++
|
|
|
-++Classes = [
|
|
|
-++ {
|
|
|
-++ 'cid': '{d54f2c89-8fd6-4eeb-a7a4-51d4dcdf460f}',
|
|
|
-++ 'contract_ids': ['@mozilla.org/network/protocol/about;1?what=%s' % page
|
|
|
-++ for page in pages],
|
|
|
-++ 'constructor': 'AboutRedirector',
|
|
|
-++ },
|
|
|
-++]
|
|
|
++EXTRA_JS_MODULES += [
|
|
|
++ "AboutRedirector.jsm",
|
|
|
++]
|
|
|
++
|
|
|
++XPCOM_MANIFESTS += [
|
|
|
++ "components.conf",
|
|
|
++]
|
|
|
diff --git a/suite/components/nsAbout.js b/suite/components/nsAbout.js
|
|
|
deleted file mode 100644
|
|
|
--- a/suite/components/nsAbout.js
|
Bill Gianopoulos