10 files changed, 44 insertions, 14 deletions
diff --git a/application/palemoon/components/about/AboutRedirector.cpp b/application/palemoon/components/about/AboutRedirector.cpp
index 27f6540b2..12143b399 100644
--- a/application/palemoon/components/about/AboutRedirector.cpp
+++ b/application/palemoon/components/about/AboutRedirector.cpp
@@ -62,7 +62,7 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::HIDE_FROM_ABOUTABOUT
   },
   {
-    "permissions", "chrome://browser/content/preferences/aboutPermissions.xul",
+    "permissions", "chrome://browser/content/permissions/aboutPermissions.xul",
     nsIAboutModule::ALLOW_SCRIPT
   },
   {
diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build
index 6e83936a9..397bf5142 100644
--- a/application/palemoon/components/moz.build
+++ b/application/palemoon/components/moz.build
@@ -12,6 +12,7 @@ DIRS += [
     'feeds',
     'fuel',
     'places',
+    'permissions',
     'preferences',
     'privatebrowsing',
     'search',
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 5910ae9c0..720d1165c 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -1207,7 +1207,7 @@ BrowserGlue.prototype = {
   },
 
   _migrateUI: function BG__migrateUI() {
-    const UI_VERSION = 18;
+    const UI_VERSION = 19;
     const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
     let currentUIVersion = 0;
     try {
@@ -1426,6 +1426,22 @@ BrowserGlue.prototype = {
       catch (ex) {}
     }
 
+#ifndef MOZ_JXR
+    // Until JPEG-XR decoder is implemented (UXP #144)
+    if (currentUIVersion < 19) {
+      try {
+        let ihaPref = "image.http.accept";
+        let ihaValue = Services.prefs.getCharPref(ihaPref);
+        if (ihaValue.includes("image/jxr,")) {
+          Services.prefs.setCharPref(ihaPref, ihaValue.replace("image/jxr,", ""));
+        } else if (ihaValue.includes("image/jxr")) {
+          Services.prefs.clearUserPref(ihaPref);
+        }
+      }
+      catch (ex) {}
+    }
+#endif
+
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
diff --git a/application/palemoon/components/preferences/aboutPermissions.css b/application/palemoon/components/permissions/aboutPermissions.css
index cec82a030..d73b6a879 100644
--- a/application/palemoon/components/preferences/aboutPermissions.css
+++ b/application/palemoon/components/permissions/aboutPermissions.css
@@ -3,9 +3,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 .site {
-  -moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#site");
+  -moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#site");
 }
 
 .pluginPermission {
-  -moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#pluginPermission");
+  -moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#pluginPermission");
 }
diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/permissions/aboutPermissions.js
index 9fb12d081..6aaacf11d 100644
--- a/application/palemoon/components/preferences/aboutPermissions.js
+++ b/application/palemoon/components/permissions/aboutPermissions.js
@@ -480,7 +480,7 @@ var AboutPermissions = {
       .createBundle("chrome://browser/locale/browser.properties"),
 
   _stringBundleAboutPermissions: Services.strings.createBundle(
-      "chrome://browser/locale/preferences/aboutPermissions.properties"),
+      "chrome://browser/locale/permissions/aboutPermissions.properties"),
 
   _initPart1: function() {
     this.initPluginList();
diff --git a/application/palemoon/components/preferences/aboutPermissions.xml b/application/palemoon/components/permissions/aboutPermissions.xml
index 4df0d964d..2932ea08c 100644
--- a/application/palemoon/components/preferences/aboutPermissions.xml
+++ b/application/palemoon/components/permissions/aboutPermissions.xml
@@ -4,7 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE bindings [
-<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" >
+<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" >
 %aboutPermissionsDTD;
 ]>
 
diff --git a/application/palemoon/components/preferences/aboutPermissions.xul b/application/palemoon/components/permissions/aboutPermissions.xul
index 56d6cfbbf..23c1dd861 100644
--- a/application/palemoon/components/preferences/aboutPermissions.xul
+++ b/application/palemoon/components/permissions/aboutPermissions.xul
@@ -4,13 +4,13 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/aboutPermissions.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/aboutPermissions.css"?>
+<?xml-stylesheet href="chrome://browser/content/permissions/aboutPermissions.css"?>
+<?xml-stylesheet href="chrome://browser/skin/permissions/aboutPermissions.css"?>
 
 <!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
-<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" >
+<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" >
 %aboutPermissionsDTD;
 ]>
 
@@ -23,7 +23,7 @@
       role="application">
 
   <script type="application/javascript"
-          src="chrome://browser/content/preferences/aboutPermissions.js"/>
+          src="chrome://browser/content/permissions/aboutPermissions.js"/>
 
   <keyset>
     <key key="&focusSearch.key;" modifiers="accel" oncommand="AboutPermissions.focusFilterBox();"/>
diff --git a/application/palemoon/components/permissions/jar.mn b/application/palemoon/components/permissions/jar.mn
new file mode 100644
index 000000000..53fb2b41e
--- /dev/null
+++ b/application/palemoon/components/permissions/jar.mn
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+browser.jar:
+    content/browser/permissions/aboutPermissions.xul
+    content/browser/permissions/aboutPermissions.js
+    content/browser/permissions/aboutPermissions.css
+    content/browser/permissions/aboutPermissions.xml
diff --git a/application/palemoon/components/permissions/moz.build b/application/palemoon/components/permissions/moz.build
new file mode 100644
index 000000000..a4c26de89
--- /dev/null
+++ b/application/palemoon/components/permissions/moz.build
@@ -0,0 +1,8 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn
index 798a2dae4..2e2949306 100644
--- a/application/palemoon/components/preferences/jar.mn
+++ b/application/palemoon/components/preferences/jar.mn
@@ -3,10 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-    content/browser/preferences/aboutPermissions.xul
-    content/browser/preferences/aboutPermissions.js
-    content/browser/preferences/aboutPermissions.css
-    content/browser/preferences/aboutPermissions.xml
 *   content/browser/preferences/advanced.xul
 *   content/browser/preferences/advanced.js
     content/browser/preferences/applications.xul