[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor-launcher] branch main updated: Bug 40730: Update tor-launcher for Firefox 102.
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main
in repository tor-launcher.
The following commit(s) were added to refs/heads/main by this push:
new 583a409 Bug 40730: Update tor-launcher for Firefox 102.
583a409 is described below
commit 583a4091e482a32d05f837784a18557392cb6ccb
Author: Pier Angelo Vendrame <pierov@xxxxxxxxxxxxxx>
AuthorDate: Tue Aug 2 09:55:08 2022 +0200
Bug 40730: Update tor-launcher for Firefox 102.
Components need to be defined inside a components.conf with 102,
otherwise they are not found.
---
components.conf | 16 ++++++++++++++++
jar.mn | 8 ++------
jar.mn.in | 6 ------
moz.build | 4 ++++
src/components/tl-process.js | 6 ++++++
src/components/tl-protocol.js | 6 ++++++
6 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/components.conf b/components.conf
new file mode 100644
index 0000000..d9f792b
--- /dev/null
+++ b/components.conf
@@ -0,0 +1,16 @@
+Classes = [
+ {
+ 'cid': '{4f476361-23fb-43ef-a427-b36a14d3208e}',
+ 'contract_ids': ['@torproject.org/torlauncher-protocol-service;1'],
+ 'jsm': 'resource:///chrome/torlauncher/components/tl-protocol.js',
+ 'constructor': 'getTorProtocolService',
+ 'singleton': True,
+ },
+ {
+ 'cid': '{fe7b4caf-bcf4-4848-8bff-efa66c9afda1}',
+ 'contract_ids': ['@torproject.org/torlauncher-process-service;1'],
+ 'jsm': 'resource:///chrome/torlauncher/components/tl-process.js',
+ 'constructor': 'getTorProcessService',
+ 'singleton': True,
+ },
+]
diff --git a/jar.mn b/jar.mn
index e229837..ed6ac2d 100644
--- a/jar.mn
+++ b/jar.mn
@@ -15,14 +15,10 @@ torlauncher.jar:
% skin torlauncher default %skin/
skin/ (src/chrome/skin/*)
-% component {4F476361-23FB-43EF-A427-B36A14D3208E} %components/tl-protocol.js
-% contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427-B36A14D3208E}
-
-% component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} %components/tl-process.js
-% contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
-
% category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1
+% category l10n-registry tor-launcher resource://torbutton/locale/{locale}/
+
% locale torlauncher en-US %locale/en-US/
locale/en-US/ (src/chrome/locale/en-US/*)
% locale torlauncher ar %locale/ar/
diff --git a/jar.mn.in b/jar.mn.in
index 9d0d0ee..153a49a 100644
--- a/jar.mn.in
+++ b/jar.mn.in
@@ -15,12 +15,6 @@ torlauncher.jar:
% skin torlauncher default %skin/
skin/ (src/chrome/skin/*)
-% component {4F476361-23FB-43EF-A427-B36A14D3208E} %components/tl-protocol.js
-% contract @torproject.org/torlauncher-protocol-service;1 {4F476361-23FB-43EF-A427-B36A14D3208E}
-
-% component {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1} %components/tl-process.js
-% contract @torproject.org/torlauncher-process-service;1 {FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}
-
% category profile-after-change TorProcessService @torproject.org/torlauncher-process-service;1
% locale torlauncher en-US %locale/en-US/
diff --git a/moz.build b/moz.build
index bf6d4a6..bbce870 100644
--- a/moz.build
+++ b/moz.build
@@ -6,3 +6,7 @@
JAR_MANIFESTS += ['jar.mn']
JS_PREFERENCE_FILES += [ 'src/defaults/preferences/torlauncher-prefs.js' ]
+
+XPCOM_MANIFESTS += [
+ "components.conf",
+]
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 1c830d9..c0d63af 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -3,6 +3,8 @@
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+var EXPORTED_SYMBOLS = ["getTorProcessService"];
+
const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm")
const Cc = Components.classes;
@@ -1172,3 +1174,7 @@ function NSGetFactory(aClassID)
return gTorProcessService;
}
+
+function getTorProcessService() {
+ return gTorProcessService;
+}
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index f5dddeb..fdfb716 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -7,6 +7,8 @@
// To avoid deadlock due to JavaScript threading limitations, this component
// should never make a direct call into the process component.
+var EXPORTED_SYMBOLS = ["getTorProtocolService"];
+
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cr = Components.results;
@@ -1413,3 +1415,7 @@ function NSGetFactory(aClassID)
return gTorProtocolService;
}
+
+function getTorProtocolService() {
+ return gTorProtocolService;
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits