summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgirst <girst@users.noreply.github.com>2023-07-14 13:10:18 +0200
committergirst <girst@users.noreply.github.com>2023-07-14 13:16:56 +0200
commitfc77a6afa82b058faf12411af45aee62d32450e6 (patch)
tree699e40010ceef0edc03037dda440f1fbf7c1a27c
parent79ef33ee7354f59451c80cedd3eac63bc2e36be4 (diff)
downloadlegacywolf-fc77a6afa82b058faf12411af45aee62d32450e6.tar.gz
legacywolf-fc77a6afa82b058faf12411af45aee62d32450e6.zip
add backwards compatible code for Services.jsm removal
makes LegacyFox compatible with Firefox 117. regressed-by: https://bugzilla.mozilla.org/show_bug.cgi?id=1780695 see-also: https://hg.mozilla.org/mozilla-central/rev/911d540fce6f
-rw-r--r--legacy/BootstrapLoader.jsm2
-rw-r--r--legacy/RDFDataSource.jsm3
2 files changed, 2 insertions, 3 deletions
diff --git a/legacy/BootstrapLoader.jsm b/legacy/BootstrapLoader.jsm
index cd7b64c..e2a693d 100644
--- a/legacy/BootstrapLoader.jsm
+++ b/legacy/BootstrapLoader.jsm
@@ -14,8 +14,8 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Blocklist: "resource://gre/modules/Blocklist.jsm",
ConsoleAPI: "resource://gre/modules/Console.jsm",
InstallRDF: "resource://legacy/RDFManifestConverter.jsm",
- Services: "resource://gre/modules/Services.jsm",
});
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
XPCOMUtils.defineLazyGetter(this, "BOOTSTRAP_REASONS", () => {
const {XPIProvider} = ChromeUtils.import("resource://gre/modules/addons/XPIProvider.jsm");
diff --git a/legacy/RDFDataSource.jsm b/legacy/RDFDataSource.jsm
index fadaab1..142e093 100644
--- a/legacy/RDFDataSource.jsm
+++ b/legacy/RDFDataSource.jsm
@@ -140,8 +140,7 @@ XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser", "Element", "XMLSerializer
ChromeUtils.defineModuleGetter(this, "OS",
"resource://gre/modules/osfile.jsm");
-ChromeUtils.defineModuleGetter(this, "Services",
- "resource://gre/modules/Services.jsm");
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
function isAttr(obj) {
return obj && typeof obj == "object" && ChromeUtils.getClassName(obj) == "Attr";