From fc77a6afa82b058faf12411af45aee62d32450e6 Mon Sep 17 00:00:00 2001 From: girst Date: Fri, 14 Jul 2023 13:10:18 +0200 Subject: 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 --- legacy/BootstrapLoader.jsm | 2 +- legacy/RDFDataSource.jsm | 3 +-- 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"; -- cgit v1.2.3