summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-08-22 08:25:44 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-08-22 08:25:44 -0400
commit31def0da05280ab834c3585c37ec1b5cde29c89c (patch)
tree347c8b3a9e7d5a1b920cc01c3eba47cca5459bbc
parentab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff)
downloadUXP-31def0da05280ab834c3585c37ec1b5cde29c89c.tar
UXP-31def0da05280ab834c3585c37ec1b5cde29c89c.tar.gz
UXP-31def0da05280ab834c3585c37ec1b5cde29c89c.tar.lz
UXP-31def0da05280ab834c3585c37ec1b5cde29c89c.tar.xz
UXP-31def0da05280ab834c3585c37ec1b5cde29c89c.zip
[MCP Applications] Add %WIDGET_TOOLKIT% to the AUS update url for Pale Moon and Basilisk
Also removes the redundant branding version of app.update.url in Pale Moon that was missed when many prefs were merged back into application preferences
-rw-r--r--application/basilisk/branding/official/pref/basilisk-branding.js2
-rw-r--r--application/palemoon/app/profile/palemoon.js2
-rw-r--r--application/palemoon/branding/shared/pref/preferences.inc2
3 files changed, 2 insertions, 4 deletions
diff --git a/application/basilisk/branding/official/pref/basilisk-branding.js b/application/basilisk/branding/official/pref/basilisk-branding.js
index 190b84e78..946902f88 100644
--- a/application/basilisk/branding/official/pref/basilisk-branding.js
+++ b/application/basilisk/branding/official/pref/basilisk-branding.js
@@ -11,7 +11,7 @@
#define BRANDING_RELNOTESPATH releasenotes.shtml
#define BRANDING_FIRSTRUNPATH firstrun/
#define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@
-#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%
+#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&toolkit=%WIDGET_TOOLKIT%&buildid=%BUILD_ID%&channel=%CHANNEL%
// Shared Branding Preferences
// XXX: These should REALLY go back to application preferences
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index d0e078eb7..ee71c4ea1 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -160,7 +160,7 @@ pref("app.update.silent", false);
pref("app.update.staging.enabled", true);
// Update service URL:
-pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
+pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&toolkit=%WIDGET_TOOLKIT%&buildid=%BUILD_ID%&channel=%CHANNEL%");
// app.update.url.manual is in branding section
// app.update.url.details is in branding section
diff --git a/application/palemoon/branding/shared/pref/preferences.inc b/application/palemoon/branding/shared/pref/preferences.inc
index 12803f285..fe1a2f003 100644
--- a/application/palemoon/branding/shared/pref/preferences.inc
+++ b/application/palemoon/branding/shared/pref/preferences.inc
@@ -12,8 +12,6 @@ pref("browser.identity.ssl_domain_display", 1); //show domain verified SSL (blue
// ===| Application Update Service |===========================================
-pref("app.update.url", "https://aus.palemoon.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
-
// The time interval between the downloading of mar file chunks in the
// background (in seconds)
pref("app.update.download.backgroundInterval", 600);