From 25664f0b2c3238704c7509cc661d52b6b5763599 Mon Sep 17 00:00:00 2001 From: girst Date: Thu, 29 Feb 2024 18:52:05 +0100 Subject: [PATCH] fix setting softDisabled state not that it is too important. Blocklist.jsm does not export blocklist state any more. XPIInstall.jsm does this, since way before mozilla61: const { nsIBlocklistService } = Ci; addon.softDisabled = addon.blocklistState == nsIBlocklistService.STATE_SOFTBLOCKED; c.f. https://searchfox.org/mozilla-central/rev/b503616295d69fee56300e5e2093599e6fb4f0e2/toolkit/mozapps/extensions/internal/XPIInstall.jsm#531 --- legacy/BootstrapLoader.jsm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/legacy/BootstrapLoader.jsm b/legacy/BootstrapLoader.jsm index ff52e80..a4010b3 100644 --- a/legacy/BootstrapLoader.jsm +++ b/legacy/BootstrapLoader.jsm @@ -11,7 +11,6 @@ const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm") XPCOMUtils.defineLazyModuleGetters(this, { AddonInternal: "resource://gre/modules/addons/XPIDatabase.jsm", - Blocklist: "resource://gre/modules/Blocklist.jsm", InstallRDF: "resource://legacy/RDFManifestConverter.jsm", }); const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services; @@ -274,7 +273,7 @@ var BootstrapLoader = { } addon.userDisabled = false; - addon.softDisabled = addon.blocklistState == Blocklist.STATE_SOFTBLOCKED; + addon.softDisabled = addon.blocklistState == Ci.nsIBlocklistService.STATE_SOFTBLOCKED; addon.applyBackgroundUpdates = AddonManager.AUTOUPDATE_DEFAULT; addon.userPermissions = null; -- 2.39.3