diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-03-08 12:20:38 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-03-08 12:20:38 -0500 |
| commit | 2e5f399735258263bc1b172b5312567d1256093c (patch) | |
| tree | 8d07c6a2aa32f43bb417218a7c5e2a29276fd367 | |
| parent | 88cfcc8a55dba2ce74c1cc35b08001b53d574100 (diff) | |
| download | UXP-2e5f399735258263bc1b172b5312567d1256093c.tar UXP-2e5f399735258263bc1b172b5312567d1256093c.tar.gz UXP-2e5f399735258263bc1b172b5312567d1256093c.tar.lz UXP-2e5f399735258263bc1b172b5312567d1256093c.tar.xz UXP-2e5f399735258263bc1b172b5312567d1256093c.zip | |
Port Pale Moon commit a3044d3 - Exclude default theme from update checks.
Do this both for TychoAM and WebExAM
| -rw-r--r-- | toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm | 7 | ||||
| -rw-r--r-- | toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm index 7e86fceab..d68a0f175 100644 --- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm +++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm @@ -765,8 +765,9 @@ this.AddonUpdateChecker = { * @return UpdateParser so that the caller can use UpdateParser.cancel() to shut * down in-progress update requests */ - checkForUpdates: function AUC_checkForUpdates(aId, aUpdateKey, aUrl, - aObserver) { - return new UpdateParser(aId, aUpdateKey, aUrl, aObserver); + checkForUpdates: function AUC_checkForUpdates(aId, aUpdateKey, aUrl, aObserver) { + // Exclude default theme + if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}") + return new UpdateParser(aId, aUpdateKey, aUrl, aObserver); } }; 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); } }; |