diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-05-09 16:57:05 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-05-09 16:57:05 -0400 |
| commit | 1b5c261b80f7603525df301764af7dc176203ccd (patch) | |
| tree | 4260a4cb38ce72723ad19eee733b7c2186754682 /application | |
| parent | 95607bd727f6a538d539f14f51a55b5a4f902427 (diff) | |
| download | uxp-1b5c261b80f7603525df301764af7dc176203ccd.tar.gz | |
Issue #968 - Preload the permissions manager with permissions file
Diffstat (limited to 'application')
| -rw-r--r-- | application/palemoon/app/moz.build | 1 | ||||
| -rw-r--r-- | application/palemoon/app/permissions | 14 | ||||
| -rw-r--r-- | application/palemoon/app/profile/palemoon.js | 6 | ||||
| -rw-r--r-- | application/palemoon/installer/package-manifest.in | 1 |
4 files changed, 19 insertions, 3 deletions
diff --git a/application/palemoon/app/moz.build b/application/palemoon/app/moz.build index c11f4c37ed..8166760af9 100644 --- a/application/palemoon/app/moz.build +++ b/application/palemoon/app/moz.build @@ -20,6 +20,7 @@ if CONFIG['LIBXUL_SDK']: SOURCES += ['nsBrowserApp.cpp'] FINAL_TARGET_FILES += ['blocklist.xml'] +FINAL_TARGET_FILES.defaults += ['permissions'] FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js'] DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] diff --git a/application/palemoon/app/permissions b/application/palemoon/app/permissions new file mode 100644 index 0000000000..4d90be82a6 --- /dev/null +++ b/application/palemoon/app/permissions @@ -0,0 +1,14 @@ +# This file has default permissions for the permission manager.
+# The file-format is strict:
+# * matchtype \t type \t permission \t host
+# * "origin" should be used for matchtype, "host" is supported for legacy reasons
+# * type is a string that identifies the type of permission (e.g. "cookie")
+# * permission is an integer between 1 and 15
+# See nsPermissionManager.cpp for more...
+
+# XPInstall
+origin install 1 http://www.palemoon.org
+origin install 1 https://www.palemoon.org
+
+origin install 1 http://addons.palemoon.org
+origin install 1 https://addons.palemoon.org
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index bd1b62cc3d..974d76d4b5 100644 --- a/application/palemoon/app/profile/palemoon.js +++ b/application/palemoon/app/profile/palemoon.js @@ -206,9 +206,6 @@ pref("extensions.dss.switchPending", false); // Non-dynamic switch pending af pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name", "chrome://browser/locale/browser.properties"); pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties"); -pref("xpinstall.whitelist.add", "addons.mozilla.org,www.palemoon.org,addons.palemoon.org"); -pref("xpinstall.whitelist.add.36", ""); -pref("xpinstall.whitelist.add.180", ""); pref("xpinstall.whitelist.required", false); // Allow installing XPI add-ons by direct URL requests (no referrer) pref("xpinstall.whitelist.directRequest", true); @@ -1103,6 +1100,9 @@ pref("full-screen-api.enabled", true); // 0-100 (currently) pref("permissions.places-sites-limit", 50); +// Built-in default permissions. +pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions"); + // Startup Crash Tracking // number of startup crashes that can occur before starting into safe mode automatically // (this pref has no effect if more than 6 hours have passed since the last crash) diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index d8722bf08b..0d80e15f95 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -231,6 +231,7 @@ ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs +@RESPATH@/browser/defaults/permissions @RESPATH@/browser/@PREF_DIR@/palemoon.js @RESPATH@/browser/@PREF_DIR@/palemoon-branding.js @RESPATH@/greprefs.js |