summaryrefslogtreecommitdiffstats
path: root/application/palemoon/app/profile/palemoon.js
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-09-06 10:29:38 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-09-06 10:29:38 +0200
commit9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7 (patch)
tree0f3678a1ed688c2f430b1cae5859916790908ac6 /application/palemoon/app/profile/palemoon.js
parentab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff)
parent6db06749e2037029adc96660aafa5339ed609e60 (diff)
downloadUXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar
UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.gz
UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.lz
UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.tar.xz
UXP-9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7.zip
Merge branch 'master' into release
Diffstat (limited to 'application/palemoon/app/profile/palemoon.js')
-rw-r--r--application/palemoon/app/profile/palemoon.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index d0e078eb7..df46ea4b6 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
@@ -682,6 +682,15 @@ pref("plugins.update.notifyUser", false);
//Enable tri-state option (Always/Never/Ask)
pref("plugins.click_to_play", true);
+// Platform pref is to enable all plugins by default.
+// Uncomment this pref to default to click-to-play
+// pref("plugin.default.state", 1);
+
+// Don't load plugin instances with no src declared.
+// These prefs are documented in detail in all.js.
+pref("plugins.favorfallback.mode", "follow-ctp");
+pref("plugins.favorfallback.rules", "nosrc");
+
#ifdef XP_WIN
pref("browser.preferences.instantApply", false);
#else