Merge pull request #471 from janekptacijarabaci/pm_move_permissions_1

[PALEMOON] Moving About permissions component files from components/preferences/ to components/permissions/

18 files changed, 32 insertions, 18 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/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
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd
index 14412607a..14412607a 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.properties b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.properties
index ca90a6cfb..ca90a6cfb 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.properties
+++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.properties
diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn
index f2b9ddeb2..046cb0ac7 100644
--- a/application/palemoon/locales/jar.mn
+++ b/application/palemoon/locales/jar.mn
@@ -55,8 +55,8 @@
     locale/browser/places/moveBookmarks.dtd        (%chrome/browser/places/moveBookmarks.dtd)
     locale/browser/feeds/subscribe.dtd              (%chrome/browser/feeds/subscribe.dtd)
     locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
-    locale/browser/preferences/aboutPermissions.dtd          (%chrome/browser/preferences/aboutPermissions.dtd)
-    locale/browser/preferences/aboutPermissions.properties   (%chrome/browser/preferences/aboutPermissions.properties)
+    locale/browser/permissions/aboutPermissions.dtd          (%chrome/browser/permissions/aboutPermissions.dtd)
+    locale/browser/permissions/aboutPermissions.properties   (%chrome/browser/permissions/aboutPermissions.properties)
     locale/browser/preferences/advanced.dtd           (%chrome/browser/preferences/advanced.dtd)
     locale/browser/preferences/applicationManager.dtd        (%chrome/browser/preferences/applicationManager.dtd)
     locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn
index 570bbb153..ec638f54c 100644
--- a/application/palemoon/themes/linux/jar.mn
+++ b/application/palemoon/themes/linux/jar.mn
@@ -97,6 +97,7 @@ browser.jar:
   skin/classic/browser/places/toolbarDropMarker.png   (places/toolbarDropMarker.png)
   skin/classic/browser/places/unsortedBookmarks.png   (places/unsortedBookmarks.png)
   skin/classic/browser/places/downloads.png           (places/downloads.png)
+  skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css)
   skin/classic/browser/preferences/alwaysAsk.png      (preferences/alwaysAsk.png)
   skin/classic/browser/preferences/mail.png           (preferences/mail.png)
   skin/classic/browser/preferences/Options.png        (preferences/Options.png)
@@ -105,7 +106,6 @@ browser.jar:
 #endif
 * skin/classic/browser/preferences/preferences.css    (preferences/preferences.css)
   skin/classic/browser/preferences/applications.css   (preferences/applications.css)
-  skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
 #ifdef MOZ_BROWSER_STATUSBAR
   skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
 * skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/permissions/aboutPermissions.css
index 2ad833fb2..2ad833fb2 100644
--- a/application/palemoon/themes/linux/preferences/aboutPermissions.css
+++ b/application/palemoon/themes/linux/permissions/aboutPermissions.css
diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn
index 28d779985..17d0637f7 100644
--- a/application/palemoon/themes/osx/jar.mn
+++ b/application/palemoon/themes/osx/jar.mn
@@ -123,6 +123,7 @@ browser.jar:
         skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
         skin/classic/browser/places/expander-closed.png              (places/expander-closed.png)
         skin/classic/browser/places/expander-open.png                (places/expander-open.png)
+        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
         skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
         skin/classic/browser/preferences/application.png             (preferences/application.png)
         skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
@@ -133,7 +134,6 @@ browser.jar:
         skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
 *       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
-        skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
 #ifdef MOZ_BROWSER_STATUSBAR
         skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
 *       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
diff --git a/application/palemoon/themes/osx/preferences/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css
index de636f5c4..de636f5c4 100644
--- a/application/palemoon/themes/osx/preferences/aboutPermissions.css
+++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css
diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn
index ce4627e21..b660ba296 100644
--- a/application/palemoon/themes/windows/jar.mn
+++ b/application/palemoon/themes/windows/jar.mn
@@ -117,6 +117,7 @@ browser.jar:
         skin/classic/browser/places/unsortedBookmarks.png            (places/unsortedBookmarks.png)
         skin/classic/browser/places/downloads.png                    (places/downloads.png)
         skin/classic/browser/places/livemark-item.png                (places/livemark-item.png)
+        skin/classic/browser/permissions/aboutPermissions.css        (permissions/aboutPermissions.css)
         skin/classic/browser/preferences/alwaysAsk.png               (preferences/alwaysAsk.png)
         skin/classic/browser/preferences/application.png             (preferences/application.png)
         skin/classic/browser/preferences/mail.png                    (preferences/mail.png)
@@ -127,7 +128,6 @@ browser.jar:
         skin/classic/browser/preferences/saveFile.png                (preferences/saveFile.png)
 *       skin/classic/browser/preferences/preferences.css             (preferences/preferences.css)
         skin/classic/browser/preferences/applications.css            (preferences/applications.css)
-        skin/classic/browser/preferences/aboutPermissions.css        (preferences/aboutPermissions.css)
 #ifdef MOZ_BROWSER_STATUSBAR
         skin/classic/browser/statusbar/dynamic.css                   (../shared/statusbar/dynamic.css)
 *       skin/classic/browser/statusbar/overlay.css                   (statusbar/overlay.css)
diff --git a/application/palemoon/themes/windows/preferences/aboutPermissions.css b/application/palemoon/themes/windows/permissions/aboutPermissions.css
index c985150de..c985150de 100644
--- a/application/palemoon/themes/windows/preferences/aboutPermissions.css
+++ b/application/palemoon/themes/windows/permissions/aboutPermissions.css