From 11a8a39f6d2e057d51559c52c1bf0ba74bbfe189 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 1 Mar 2018 14:26:41 -0500 Subject: Use MOZ_FENNEC and MOZ_XULRUNNER instead of checking MOZ_BUILD_APP in most places --- toolkit/mozapps/webextensions/moz.build | 3 --- 1 file changed, 3 deletions(-) (limited to 'toolkit/mozapps/webextensions') diff --git a/toolkit/mozapps/webextensions/moz.build b/toolkit/mozapps/webextensions/moz.build index 12640e115..b92915ae8 100644 --- a/toolkit/mozapps/webextensions/moz.build +++ b/toolkit/mozapps/webextensions/moz.build @@ -6,9 +6,6 @@ SPHINX_TREES['addon-manager'] = 'docs' -if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': - DEFINES['MOZ_FENNEC'] = True - DIRS += ['internal'] TEST_DIRS += ['test'] -- cgit v1.2.3 From 2e5f399735258263bc1b172b5312567d1256093c Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 8 Mar 2018 12:20:38 -0500 Subject: Port Pale Moon commit a3044d3 - Exclude default theme from update checks. Do this both for TychoAM and WebExAM --- toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolkit/mozapps/webextensions') diff --git a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm index 63c16737c..918ba5328 100644 --- a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm +++ b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm @@ -929,6 +929,8 @@ this.AddonUpdateChecker = { * down in-progress update requests */ checkForUpdates: function(aId, aUpdateKey, aUrl, aObserver) { - return new UpdateParser(aId, aUpdateKey, aUrl, aObserver); + // Exclude default theme + if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}") + return new UpdateParser(aId, aUpdateKey, aUrl, aObserver); } }; -- cgit v1.2.3