From 709dc6041ea9c10172ecfa549efc762216fa9cc4 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 10 Mar 2005 23:11:10 +0000
Subject: [PATCH] Bug #285158 --> Move shared pref UI files from
 mozilla\browser to mozilla\toolkit\mozapps so Firefox and Thunderbird can
 share the files together.

No actual coding or UI changes here.

sr=ben


git-svn-id: svn://10.0.0.236/trunk@170544 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/preferences/advanced.js        |   2 +-
 .../components/preferences/changeaction.xul   |   4 +-
 .../components/preferences/content.xul        |   2 +-
 .../preferences/downloadactions.xul           |   2 +-
 .../browser/components/preferences/fonts.js   |   2 +-
 .../browser/components/preferences/fonts.xul  |   2 +-
 mozilla/browser/components/preferences/jar.mn |  12 -
 .../components/preferences/preferences.css    |   5 -
 .../components/preferences/preferences.xul    |   2 +-
 .../browser/components/preferences/privacy.js |   4 +-
 mozilla/browser/locales/jar.mn                |   4 -
 .../mozapps/downloads/pref-downloads.dtd      |  27 -
 .../chrome/mozapps}/preferences/changemp.dtd  |   0
 .../mozapps}/preferences/fontscaling.dtd      |   0
 .../chrome/mozapps}/preferences/ocsp.dtd      |   0
 .../preferences/preferences.properties        |  18 +
 .../chrome/mozapps}/preferences/removemp.dtd  |   0
 mozilla/toolkit/locales/jar.mn                |   6 +-
 .../downloads/content/pref-downloads.js       | 474 ------------------
 .../downloads/content/pref-downloads.xul      | 183 -------
 mozilla/toolkit/mozapps/jar.mn                |  14 +-
 .../mozapps}/preferences/actionsshared.js     |   0
 .../mozapps}/preferences/changemp.js          |   0
 .../mozapps}/preferences/changemp.xul         |   6 +-
 .../mozapps}/preferences/fontbuilder.js       |   0
 .../mozapps}/preferences/fontscaling.js       |   0
 .../mozapps}/preferences/fontscaling.xul      |   4 +-
 .../mozapps}/preferences/ocsp.js              |   0
 .../mozapps}/preferences/ocsp.xul             |   4 +-
 .../mozapps/preferences/preferences.css       |   5 +
 .../mozapps}/preferences/preferences.xml      |   2 +-
 .../mozapps}/preferences/removemp.js          |   0
 .../mozapps}/preferences/removemp.xul         |   6 +-
 33 files changed, 61 insertions(+), 729 deletions(-)
 delete mode 100644 mozilla/browser/components/preferences/preferences.css
 delete mode 100755 mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
 rename mozilla/{browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/mozapps}/preferences/changemp.dtd (100%)
 rename mozilla/{browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/mozapps}/preferences/fontscaling.dtd (100%)
 rename mozilla/{browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/mozapps}/preferences/ocsp.dtd (100%)
 create mode 100644 mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
 rename mozilla/{browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/mozapps}/preferences/removemp.dtd (100%)
 delete mode 100755 mozilla/toolkit/mozapps/downloads/content/pref-downloads.js
 delete mode 100755 mozilla/toolkit/mozapps/downloads/content/pref-downloads.xul
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/actionsshared.js (100%)
 mode change 100755 => 100644
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/changemp.js (100%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/changemp.xul (93%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/fontbuilder.js (100%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/fontscaling.js (100%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/fontscaling.xul (94%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/ocsp.js (100%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/ocsp.xul (95%)
 create mode 100644 mozilla/toolkit/mozapps/preferences/preferences.css
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/preferences.xml (98%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/removemp.js (100%)
 rename mozilla/{browser/components => toolkit/mozapps}/preferences/removemp.xul (84%)

diff --git a/mozilla/browser/components/preferences/advanced.js b/mozilla/browser/components/preferences/advanced.js
index 2262b1a9b40..ce3d1783d32 100644
--- a/mozilla/browser/components/preferences/advanced.js
+++ b/mozilla/browser/components/preferences/advanced.js
@@ -80,7 +80,7 @@ var gAdvancedPane = {
   
   showOCSP: function ()
   {
-    document.documentElement.openSubDialog("chrome://browser/content/preferences/ocsp.xul",
+    document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
                                            "", null);
   },
   
diff --git a/mozilla/browser/components/preferences/changeaction.xul b/mozilla/browser/components/preferences/changeaction.xul
index 5647a893d47..85a3e56bfaa 100644
--- a/mozilla/browser/components/preferences/changeaction.xul
+++ b/mozilla/browser/components/preferences/changeaction.xul
@@ -38,7 +38,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/preferences.css" type="text/css"?>
+<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://browser/locale/preferences/changeaction.dtd">
@@ -50,7 +50,7 @@
         style="width: 36em;"
         persist="screenX screenY">
 
-  <script type="application/x-javascript" src="chrome://browser/content/preferences/actionsshared.js"/>
+  <script type="application/x-javascript" src="chrome://mozapps/content/preferences/actionsshared.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/preferences/changeaction.js"/>
   
   <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
diff --git a/mozilla/browser/components/preferences/content.xul b/mozilla/browser/components/preferences/content.xul
index 594a0571d03..106b5d5b12f 100644
--- a/mozilla/browser/components/preferences/content.xul
+++ b/mozilla/browser/components/preferences/content.xul
@@ -67,7 +67,7 @@
                   type="bool"/>
     </preferences>
     
-    <script type="application/x-javascript" src="chrome://browser/content/preferences/fontbuilder.js"/>
+    <script type="application/x-javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
     <script type="application/x-javascript" src="chrome://browser/content/preferences/content.js"/>
 
     <groupbox>
diff --git a/mozilla/browser/components/preferences/downloadactions.xul b/mozilla/browser/components/preferences/downloadactions.xul
index c5ef01162f2..ee394f7b51e 100644
--- a/mozilla/browser/components/preferences/downloadactions.xul
+++ b/mozilla/browser/components/preferences/downloadactions.xul
@@ -54,7 +54,7 @@
         title="&downloadactionsWindow.title;"
         width="480" height="310" persist="width height screenX screenY">
 
-  <script type="application/x-javascript" src="chrome://browser/content/preferences/actionsshared.js"/>
+  <script type="application/x-javascript" src="chrome://mozapps/content/preferences/actionsshared.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/preferences/downloadactions.js"/>
 
   <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
diff --git a/mozilla/browser/components/preferences/fonts.js b/mozilla/browser/components/preferences/fonts.js
index 80daa60f849..be95acb9693 100644
--- a/mozilla/browser/components/preferences/fonts.js
+++ b/mozilla/browser/components/preferences/fonts.js
@@ -189,7 +189,7 @@ var gFontsDialog = {
 
     if (aMenulist.selectedItem.value == "choose") {
       var rv = { newdpi: -1 };
-      document.documentElement.openSubDialog("chrome://browser/content/preferences/fontscaling.xul",
+      document.documentElement.openSubDialog("chrome://mozapps/content/preferences/fontscaling.xul",
                                              "", rv);
       if (rv.newdpi != -1) {
         this._setResolution(rv.newdpi);
diff --git a/mozilla/browser/components/preferences/fonts.xul b/mozilla/browser/components/preferences/fonts.xul
index 7c7a2a78f67..22d9ccea964 100644
--- a/mozilla/browser/components/preferences/fonts.xul
+++ b/mozilla/browser/components/preferences/fonts.xul
@@ -62,7 +62,7 @@
     </preferences>
     
     <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
-    <script type="application/x-javascript" src="chrome://browser/content/preferences/fontbuilder.js"/>
+    <script type="application/x-javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
     <script type="application/x-javascript" src="chrome://browser/content/preferences/fonts.js"/>
    
     <groupbox>
diff --git a/mozilla/browser/components/preferences/jar.mn b/mozilla/browser/components/preferences/jar.mn
index f930840191a..f04651519b5 100644
--- a/mozilla/browser/components/preferences/jar.mn
+++ b/mozilla/browser/components/preferences/jar.mn
@@ -1,11 +1,8 @@
 browser.jar:
-*   content/browser/preferences/actionsshared.js
 *   content/browser/preferences/advanced.xul
 *   content/browser/preferences/advanced.js
 *   content/browser/preferences/changeaction.xul
 *   content/browser/preferences/changeaction.js
-*   content/browser/preferences/changemp.xul
-*   content/browser/preferences/changemp.js
 *   content/browser/preferences/colors.xul
 *   content/browser/preferences/cookies.xul
 *   content/browser/preferences/cookies.js
@@ -17,28 +14,19 @@ browser.jar:
 *   content/browser/preferences/downloads.js
 *   content/browser/preferences/downloadactions.xul
 *   content/browser/preferences/downloadactions.js
-*   content/browser/preferences/fontbuilder.js
 *   content/browser/preferences/fonts.xul
 *   content/browser/preferences/fonts.js
-*   content/browser/preferences/fontscaling.xul
-*   content/browser/preferences/fontscaling.js
 *   content/browser/preferences/general.xul
 *   content/browser/preferences/general.js
 *   content/browser/preferences/helperapplications.js
 *   content/browser/preferences/languages.xul
 *   content/browser/preferences/languages.js
-*   content/browser/preferences/ocsp.xul
-*   content/browser/preferences/ocsp.js
 *   content/browser/preferences/permissions.xul
 *   content/browser/preferences/permissions.js
 *   content/browser/preferences/permissionsutils.js
 *   content/browser/preferences/preferences.xul
-*   content/browser/preferences/preferences.xml
-*   content/browser/preferences/preferences.css
 *   content/browser/preferences/privacy.xul
 *   content/browser/preferences/privacy.js
-*   content/browser/preferences/removemp.xul
-*   content/browser/preferences/removemp.js
 *   content/browser/preferences/sanitize.xul
 *   content/browser/preferences/sanitize.js
 *   content/browser/preferences/tabs.xul
diff --git a/mozilla/browser/components/preferences/preferences.css b/mozilla/browser/components/preferences/preferences.css
deleted file mode 100644
index 946fa06df9a..00000000000
--- a/mozilla/browser/components/preferences/preferences.css
+++ /dev/null
@@ -1,5 +0,0 @@
-
-filefield {
-  -moz-binding: url("chrome://browser/content/preferences/preferences.xml#fileField");
-}
-
diff --git a/mozilla/browser/components/preferences/preferences.xul b/mozilla/browser/components/preferences/preferences.xul
index 4ad9a70a1ff..f30575e3b66 100644
--- a/mozilla/browser/components/preferences/preferences.xul
+++ b/mozilla/browser/components/preferences/preferences.xul
@@ -37,7 +37,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 
 <!DOCTYPE prefwindow [
diff --git a/mozilla/browser/components/preferences/privacy.js b/mozilla/browser/components/preferences/privacy.js
index 6b7d0216635..802785545b5 100644
--- a/mozilla/browser/components/preferences/privacy.js
+++ b/mozilla/browser/components/preferences/privacy.js
@@ -193,7 +193,7 @@ var gPrivacyPane = {
   
   changeMasterPassword: function ()
   {
-    document.documentElement.openSubDialog("chrome://browser/content/preferences/changemp.xul",
+    document.documentElement.openSubDialog("chrome://mozapps/content/preferences/changemp.xul",
                                            "", null);
     this.updateMasterPasswordButton();
   },
@@ -230,7 +230,7 @@ var gPrivacyPane = {
                           bundle.getString("pw_change2empty_in_fips_mode"));
     }
     else {
-      document.documentElement.openSubDialog("chrome://browser/content/preferences/removemp.xul",
+      document.documentElement.openSubDialog("chrome://mozapps/content/preferences/removemp.xul",
                                              "", null);
       this.updateMasterPasswordButton();
       document.getElementById("setMasterPassword").focus();
diff --git a/mozilla/browser/locales/jar.mn b/mozilla/browser/locales/jar.mn
index 3bb788533d6..9612ebdd145 100644
--- a/mozilla/browser/locales/jar.mn
+++ b/mozilla/browser/locales/jar.mn
@@ -29,7 +29,6 @@
     locale/browser/migration/migration.properties  (%chrome/browser/migration/migration.properties)
     locale/browser/preferences/advanced.dtd           (%chrome/browser/preferences/advanced.dtd)
     locale/browser/preferences/changeaction.dtd       (%chrome/browser/preferences/changeaction.dtd)
-    locale/browser/preferences/changemp.dtd           (%chrome/browser/preferences/changemp.dtd)
     locale/browser/preferences/colors.dtd             (%chrome/browser/preferences/colors.dtd)
     locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
     locale/browser/preferences/content.dtd            (%chrome/browser/preferences/content.dtd)
@@ -37,15 +36,12 @@
     locale/browser/preferences/downloads.dtd          (%chrome/browser/preferences/downloads.dtd)
     locale/browser/preferences/downloadactions.dtd    (%chrome/browser/preferences/downloadactions.dtd)
     locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
-    locale/browser/preferences/fontscaling.dtd        (%chrome/browser/preferences/fontscaling.dtd)
     locale/browser/preferences/general.dtd            (%chrome/browser/preferences/general.dtd)
     locale/browser/preferences/languages.dtd          (%chrome/browser/preferences/languages.dtd)
-    locale/browser/preferences/ocsp.dtd               (%chrome/browser/preferences/ocsp.dtd)
     locale/browser/preferences/permissions.dtd        (%chrome/browser/preferences/permissions.dtd)
     locale/browser/preferences/preferences.dtd        (%chrome/browser/preferences/preferences.dtd)
     locale/browser/preferences/preferences.properties (%chrome/browser/preferences/preferences.properties)
     locale/browser/preferences/privacy.dtd            (%chrome/browser/preferences/privacy.dtd)
-    locale/browser/preferences/removemp.dtd           (%chrome/browser/preferences/removemp.dtd)
     locale/browser/preferences/sanitize.dtd           (%chrome/browser/preferences/sanitize.dtd)
     locale/browser/preferences/tabs.dtd               (%chrome/browser/preferences/tabs.dtd)
     locale/browser/sidebar/sidebar.properties      (%chrome/browser/sidebar/sidebar.properties)
diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
deleted file mode 100755
index cbcd06cf10b..00000000000
--- a/mozilla/toolkit/locales/en-US/chrome/mozapps/downloads/pref-downloads.dtd
+++ /dev/null
@@ -1,27 +0,0 @@
-<!ENTITY lHeader                      "Downloads">
-
-<!ENTITY askOnSave.label              "Download Folder">
-<!ENTITY alwaysAsk.label              "Ask me where to save every file">
-<!ENTITY neverAsk.label               "Save all files to this folder:">
-<!ENTITY desktop.label                "Desktop">
-<!ENTITY downloads.label              "My Downloads">
-<!ENTITY choose.label                 "Other...">
-<!ENTITY showFolder.label             "Show Folder">
-
-<!ENTITY downloadManagerWindow.label  "Download Manager">
-<!ENTITY showWhenStarting.label       "Show Download Manager window when a download begins.">
-<!ENTITY closeWhenDone.label          "Close the Download Manager when all downloads are complete.">
-
-<!ENTITY fileTypes.label              "File Types">
-<!-- XXX this text string could improve --> 
-<!ENTITY fileTypesDescription.label   "Automatically perform the associated action with each of the following file types:">
-<!ENTITY fileTypeColName.label        "File Type">
-<!ENTITY fileHandlerColName.label     "Application">
-<!ENTITY editFileHandler.label        "Change Action...">
-<!ENTITY editFileHandler.accesskey    "a">
-<!ENTITY removeFileHandler.label      "Remove">
-<!ENTITY removeFileHandler.accesskey  "r">
-
-<!ENTITY plugins.label                "Plug-Ins...">
-<!ENTITY plugins.accesskey            "p">
-
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/changemp.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/changemp.dtd
similarity index 100%
rename from mozilla/browser/locales/en-US/chrome/browser/preferences/changemp.dtd
rename to mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/changemp.dtd
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/fontscaling.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/fontscaling.dtd
similarity index 100%
rename from mozilla/browser/locales/en-US/chrome/browser/preferences/fontscaling.dtd
rename to mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/fontscaling.dtd
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/ocsp.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
similarity index 100%
rename from mozilla/browser/locales/en-US/chrome/browser/preferences/ocsp.dtd
rename to mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/ocsp.dtd
diff --git a/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
new file mode 100644
index 00000000000..8a75dac705b
--- /dev/null
+++ b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
@@ -0,0 +1,18 @@
+#### Change Action
+
+downloadHelperNoneSelected=None Selected
+
+#### Master Password
+
+password_not_set=(not set)
+failed_pw_change=Unable to change Master Password.
+incorrect_pw=You did not enter the correct current Master Password. Please try again.
+pw_change_ok=Master Password successfully changed.
+pw_erased_ok=You have deleted your Master Password. 
+pw_not_wanted=Warning! You have decided not to use a Master Password.
+pw_empty_warning=Your stored web and email passwords, form data, and private keys will not be protected.
+pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
+pw_change_success_title=Password Change Succeeded
+pw_change_failed_title=Password Change Failed
+pw_remove_button=Remove
+
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/removemp.dtd b/mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/removemp.dtd
similarity index 100%
rename from mozilla/browser/locales/en-US/chrome/browser/preferences/removemp.dtd
rename to mozilla/toolkit/locales/en-US/chrome/mozapps/preferences/removemp.dtd
diff --git a/mozilla/toolkit/locales/jar.mn b/mozilla/toolkit/locales/jar.mn
index 29185165eba..22bf4365115 100644
--- a/mozilla/toolkit/locales/jar.mn
+++ b/mozilla/toolkit/locales/jar.mn
@@ -65,7 +65,6 @@
 * locale/@AB_CD@/mozapps/contents.rdf                             (generic/chrome/mozapps/contents.rdf)
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.properties  (%chrome/mozapps/downloads/unknownContentType.properties)
 * locale/@AB_CD@/mozapps/downloads/unknownContentType.dtd         (%chrome/mozapps/downloads/unknownContentType.dtd)
-  locale/@AB_CD@/mozapps/downloads/pref-downloads.dtd             (%chrome/mozapps/downloads/pref-downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/editAction.dtd                 (%chrome/mozapps/downloads/editAction.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.dtd                  (%chrome/mozapps/downloads/downloads.dtd)
   locale/@AB_CD@/mozapps/downloads/downloads.properties           (%chrome/mozapps/downloads/downloads.properties)
@@ -76,6 +75,11 @@
   locale/@AB_CD@/mozapps/extensions/finalize.dtd                  (%chrome/mozapps/extensions/finalize.dtd)
   locale/@AB_CD@/mozapps/plugins/plugins.dtd                      (%chrome/mozapps/plugins/plugins.dtd)
   locale/@AB_CD@/mozapps/plugins/plugins.properties               (%chrome/mozapps/plugins/plugins.properties)
+  locale/@AB_CD@/mozapps/preferences/ocsp.dtd                     (%chrome/mozapps/preferences/ocsp.dtd)
+  locale/@AB_CD@/mozapps/preferences/fontscaling.dtd              (%chrome/mozapps/preferences/fontscaling.dtd)
+  locale/@AB_CD@/mozapps/preferences/changemp.dtd                 (%chrome/mozapps/preferences/changemp.dtd)
+  locale/@AB_CD@/mozapps/preferences/removemp.dtd                 (%chrome/mozapps/preferences/removemp.dtd)
+  locale/@AB_CD@/mozapps/preferences/preferences.properties       (%chrome/mozapps/preferences/preferences.properties)
   locale/@AB_CD@/mozapps/profile/createProfileWizard.dtd          (%chrome/mozapps/profile/createProfileWizard.dtd)
   locale/@AB_CD@/mozapps/profile/profileSelection.properties      (%chrome/mozapps/profile/profileSelection.properties)
   locale/@AB_CD@/mozapps/profile/profileSelection.dtd             (%chrome/mozapps/profile/profileSelection.dtd)
diff --git a/mozilla/toolkit/mozapps/downloads/content/pref-downloads.js b/mozilla/toolkit/mozapps/downloads/content/pref-downloads.js
deleted file mode 100755
index 97562ea4dfd..00000000000
--- a/mozilla/toolkit/mozapps/downloads/content/pref-downloads.js
+++ /dev/null
@@ -1,474 +0,0 @@
-# -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@bengoodger.com>
-#   Dan Mosedale <dmose@mozilla.org>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#ifdef MOZ_PHOENIX
-var _elementIDs = ["askOnSave", "downloadFolderList", "downloadFolder", "showWhenStarting", "closeWhenDone"];
-#else
-var _elementIDs = ["askOnSave", "downloadFolderList", "downloadFolder"];
-#endif
-
-var gLastSelectedIndex = 0;
-var gHelperApps = null;
-
-var gEditFileHandler, gRemoveFileHandler, gHandlersList;
-
-var downloadDirPref = "browser.download.dir"; 
-var downloadModePref = "browser.download.folderList";
-const nsILocalFile = Components.interfaces.nsILocalFile;
-
-function selectFolder()
-{ 
-  const nsIFilePicker = Components.interfaces.nsIFilePicker;
-  var fp = Components.classes["@mozilla.org/filepicker;1"]
-                      .createInstance(nsIFilePicker);
-  var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-
-  var bundle = document.getElementById("strings");
-  var description = bundle.getString("selectDownloadDir");
-  fp.init(window, description, nsIFilePicker.modeGetFolder);
-  try 
-  {
-    var initialDir = pref.getComplexValue(downloadDirPref, nsILocalFile);
-    if (initialDir)
-      fp.displayDirectory = initialDir;
-  }
-  catch (ex)
-  {
-    // ignore exception: file picker will open at default location
-  }
-  fp.appendFilters(nsIFilePicker.filterAll);
-  var ret = fp.show();
-
-  if (ret == nsIFilePicker.returnOK) {
-    var localFile = fp.file.QueryInterface(nsILocalFile);
-    pref.setComplexValue(downloadDirPref, nsILocalFile, localFile)
-    selectCustomFolder(true);
-  }
-  else {
-    var folderList = document.getElementById("downloadFolderList");
-    folderList.selectedIndex = gLastSelectedIndex;
-  }
-}
-
-function doEnabling(aSelectedItem)
-{
-  var textbox = document.getElementById("downloadFolderList");
-  var button = document.getElementById("showFolder");
-  var disable = aSelectedItem.id == "alwaysAsk";
-  textbox.disabled = disable;
-  button.disabled = disable;
-}
-
-function Startup() 
-{
-  var folderList = document.getElementById("downloadFolderList");
-  
-  const nsILocalFile = Components.interfaces.nsILocalFile;
-  var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-                      
-  try {
-    var downloadDir = pref.getComplexValue(downloadDirPref, nsILocalFile);  
-    
-    var desktop = getDownloadsFolder("Desktop");
-    var downloads = getDownloadsFolder("Downloads");
-    
-    // Check to see if the user-entered download dir is actually one of our
-    // enumerated values (Desktop, My Downloads) and if so select that
-    // item instead of the user selected one. 
-    // XXX - It's lame that I should have to compare the path directly. The 
-    // win32 implementation of nsIFile should know that Windows is not case 
-    // sensitive.
-    var downloadPath = downloadDir.path.toUpperCase();
-    if (downloadPath == desktop.path.toUpperCase()) {
-      pref.clearUserPref(downloadDirPref);
-      pref.setIntPref(downloadModePref, 0);
-      folderList.selectedIndex = 0;
-    }
-    else if (downloadPath == downloads.path.toUpperCase()) {
-      pref.clearUserPref(downloadDirPref);
-      pref.setIntPref(downloadModePref, 1);
-      folderList.selectedIndex = 1;
-    }
-  }
-  catch (e) {
-  }
-  
-  try {
-    selectCustomFolder(false);
-  }
-  catch (e) {
-  }
-  
-  gLastSelectedIndex = folderList.selectedIndex;
-  
-  // Initialize the File Type list
-  gHelperApps = new HelperApps();
-  
-  gHandlersList = document.getElementById("fileHandlersList");
-  gHandlersList.database.AddDataSource(gHelperApps);
-  gHandlersList.setAttribute("ref", "urn:mimetypes");
-  
-  (gEditFileHandler = document.getElementById("editFileHandler")).disabled = true;
-  (gRemoveFileHandler = document.getElementById("removeFileHandler")).disabled = true;
-  
-  parent.hPrefWindow.registerOKCallbackFunc(updateSaveToFolder);
-  // XXXben such a hack. Should really update the OKCallbackFunction thing a bit to 
-  //        let it support holding arbitrary data. 
-  parent.hPrefWindow.getSpecialFolderKey = getSpecialFolderKey;
-
-  // XXXben menulist hack #43. When initializing the display to the custom
-  //        download path field, the field is blank. 
-  var downloadFolderList = document.getElementById("downloadFolderList");
-  downloadFolderList.parentNode.removeChild(downloadFolderList);
-  var showFolder = document.getElementById("showFolder");
-  showFolder.parentNode.insertBefore(downloadFolderList, showFolder);
-  downloadFolderList.hidden = false;
-
-#ifdef MOZ_PHOENIX
-  toggleDMPrefUI(document.getElementById("showWhenStarting"));
-#endif
-  
-  setTimeout(postStart, 0);
-}
-
-function postStart()
-{
-  var downloadFolderList = document.getElementById("downloadFolderList");
-  downloadFolderList.label = downloadFolderList.selectedItem.label;
-}
-
-function uninit()
-{
-  gHandlersList.database.RemoveDataSource(gHelperApps);
-  
-  gHelperApps.destroy();
-}
-
-// WARNING WARNING WARNING
-// This is a Options OK Callback
-// When this function is called the Downloads panel's document object 
-// MAY NOT BE AVAILABLE. As a result referring to any item in it in this
-// function will probably cause the Options window not to close when OK
-// is pressed. 
-function updateSaveToFolder()
-{
-  var prefs = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-  function getPref(aPrefName, aPrefGetter, aDefVal) 
-  {
-    try {
-      var val = prefs[aPrefGetter](aPrefName);
-    }
-    catch (e) {
-      val = aDefVal;
-    }
-    return val;                
-  }
-
-  var defaultFolderPref = "browser.download.defaultFolder";
-  var downloadDirPref = "browser.download.dir";
-
-  var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://mozapps/content/downloads/pref-downloads.xul"].elementIDs;
-  // Don't let the variable names here fool you. This code executes if the 
-  // user chooses to have all files auto-download to a specific folder.
-  if (data.askOnSave.value == "true") {
-    var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties);
-    
-    var bundle = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
-    bundle = bundle.createBundle("chrome://mozapps/locale/downloads/unknownContentType.properties");
-    var description = bundle.GetStringFromName("myDownloads");
-    var targetFolder = null;
-
-    switch (parseInt(data.downloadFolderList.value)) {
-    case 1:
-      targetFolder = fileLocator.get(parent.hPrefWindow.getSpecialFolderKey("Downloads"), 
-                                     Components.interfaces.nsIFile);
-      targetFolder.append(description);
-      break;
-    case 2:
-      targetFolder = prefs.getComplexValue(downloadDirPref, 
-                                           Components.interfaces.nsILocalFile);  
-      break;
-    case 0:
-    default:          
-      targetFolder = fileLocator.get(parent.hPrefWindow.getSpecialFolderKey("Desktop"), 
-                                      Components.interfaces.nsIFile);
-      break;
-    }
-    prefs.setComplexValue(defaultFolderPref,
-                          Components.interfaces.nsILocalFile,
-                          targetFolder);
-  }
-  else if (prefs.prefHasUserValue(defaultFolderPref))
-    prefs.clearUserPref(defaultFolderPref);  
-}
-
-function selectCustomFolder(aShouldSelectItem)
-{
-  var pref = Components.classes["@mozilla.org/preferences-service;1"]
-                      .getService(Components.interfaces.nsIPrefBranch);
-  var downloadDir = pref.getComplexValue(downloadDirPref, nsILocalFile);
-  
-  var folder = document.getElementById("downloadFolder");
-  folder.label = downloadDir.path;
-  folder.setAttribute("path", downloadDir.path);
-  folder.hidden = false;
-  
-  var folderList = document.getElementById("downloadFolderList");
-  if (aShouldSelectItem)
-    folderList.selectedIndex = 2;
-}
-
-function folderListCommand(aEvent)
-{
-  var folderList = document.getElementById("downloadFolderList");
-  if (folderList.selectedItem.getAttribute("value") == 9)
-    selectFolder();
-  
-  var selectedIndex = folderList.selectedIndex;
-
-  if (selectedIndex == 1) {
-    var downloads = getDownloadsFolder("Downloads");
-    if (!downloads.exists())
-      downloads.create(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
-  }
-  
-  // folderList.inputField.readonly = (selectedIndex == 0 || selectedIndex == 1);
-
-  gLastSelectedIndex = folderList.selectedIndex;
-}
-
-function showFolder()
-{
-  var folderList = document.getElementById("downloadFolderList");
-
-  var folder = null;
-  
-  switch (folderList.selectedIndex) {
-  case 0:
-    folder = getDownloadsFolder("Desktop");
-    break;
-  case 1:
-    folder = getDownloadsFolder("Downloads");
-    break;
-  case 2:
-    var path = document.getElementById("downloadFolder").getAttribute("path");
-    folder = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-    folder.initWithPath(path);
-    break;
-  }
-
-  try {
-    folder.reveal();
-  } catch (ex) {
-    // if nsILocalFile::Reveal failed (ie it currently just returns an
-    // error on unix), send the directory to the system file: handler
-
-    var uri = Components.classes["@mozilla.org/network/io-service;1"]
-                        .getService(Components.interfaces.nsIIOService)
-                        .newFileURI(folder);
-
-    var protocolSvc = Components.classes
-      ["@mozilla.org/uriloader/external-protocol-service;1"]
-      .getService(Components.interfaces.nsIExternalProtocolService);
-    protocolSvc.loadUrl(uri);
-  }
-}
-
-function getSpecialFolderKey(aFolderType) 
-{
-  if (aFolderType == "Desktop")
-    return "Desk";
-
-  if (aFolderType != "Downloads")
-    throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
-
-#ifdef XP_WIN
-  return "Pers";
-#else
-#ifdef XP_MACOSX
-  return "UsrDocs";
-#else
-  return "Home";
-#endif
-#endif
-}
-
-function getDownloadsFolder(aFolder)
-{
-  var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"].getService(Components.interfaces.nsIProperties);
-
-  var dir = fileLocator.get(getSpecialFolderKey(aFolder), Components.interfaces.nsILocalFile);
-  var bundle = document.getElementById("strings");
-  var description = bundle.getString("myDownloads");
-  if (aFolder != "Desktop")
-    dir.append(description);
-    
-  return dir;
-}
-
-function fileHandlerListSelectionChanged(aEvent)
-{
-  var selection = gHandlersList.view.selection; 
-  var selected = selection.count;
-  gRemoveFileHandler.disabled = selected == 0;
-  gEditFileHandler.disabled = selected != 1;
-  
-  var canRemove = true;
-  
-  var cv = gHandlersList.contentView;
-  var rangeCount = selection.getRangeCount();
-  var min = { }, max = { };
-  for (var i = 0; i < rangeCount; ++i) {
-    selection.getRangeAt(i, min, max);
-    
-    for (var j = min.value; j <= max.value; ++j) {
-      var item = cv.getItemAtIndex(j);
-      var editable = gHelperApps.getLiteralValue(item.id, "editable") == "true";
-      var handleInternal = gHelperApps.getLiteralValue(item.id, "handleInternal");
-      
-      if (!editable || handleInternal) 
-        canRemove = false;
-    }
-  }
-  
-  if (!canRemove) {
-    gRemoveFileHandler.disabled = true;
-    gEditFileHandler.disabled = true;
-  }
-}
-
-function removeFileHandler()
-{
-  const nsIPS = Components.interfaces.nsIPromptService;
-  var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(nsIPS);
-  
-  var bundle = document.getElementById("strings");
-  var title = bundle.getString("removeActions");
-  var msg = bundle.getString("removeActionsMsg");
-
-  var buttons = (nsIPS.BUTTON_TITLE_YES * nsIPS.BUTTON_POS_0) + (nsIPS.BUTTON_TITLE_NO * nsIPS.BUTTON_POS_1);
-
-  if (ps.confirmEx(window, title, msg, buttons, "", "", "", "", { }) == 1) 
-    return;
-  
-  var c = Components.classes["@mozilla.org/rdf/container;1"].createInstance(Components.interfaces.nsIRDFContainer);
-  c.Init(gHelperApps, gRDF.GetResource("urn:mimetypes:root"));
-  
-  var cv = gHandlersList.contentView;
-  var selection = gHandlersList.view.selection; 
-  var rangeCount = selection.getRangeCount();
-  var min = { }, max = { };
-  
-  var lastAdjacent = -1;
-  for (var i = 0; i < rangeCount; ++i) {
-    selection.getRangeAt(i, min, max);
-    
-    if (i == (rangeCount - 1)) { 
-      if (min.value >= (gHandlersList.view.rowCount - selection.count)) 
-        lastAdjacent = min.value - 1;
-      else
-        lastAdjacent = min.value;
-    }
-    
-    for (var j = max.value; j >= min.value; --j) {
-      var item = cv.getItemAtIndex(j);
-      var itemResource = gRDF.GetResource(item.id);
-      c.RemoveElement(itemResource, j == min.value);
-      
-      cleanResource(itemResource);
-    }
-  }
-
-  if (lastAdjacent != -1) {
-    selection.select(lastAdjacent);
-    gHandlersList.focus();
-  }
-  
-  gHelperApps.flush();
-}
-
-function cleanResource(aResource)
-{
-  var handlerProp = gHelperApps.GetTarget(aResource, gHelperApps._handlerPropArc, true);
-  if (handlerProp) {
-    var extApp = gHelperApps.GetTarget(handlerProp, gHelperApps._externalAppArc, true);
-    if (extApp)
-      disconnect(extApp);
-    disconnect(handlerProp);
-  }
-  disconnect(aResource);
-}
-
-function disconnect(aResource)
-{
-  var arcs = gHelperApps.ArcLabelsOut(aResource);
-  while (arcs.hasMoreElements()) {
-    var arc = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-    var val = gHelperApps.GetTarget(aResource, arc, true);
-    gHelperApps.Unassert(aResource, arc, val, true);
-  }
-}
-
-function editFileHandler()
-{
-  var selection = gHandlersList.view.selection; 
-  
-  var cv = gHandlersList.contentView;
-  var item = cv.getItemAtIndex(selection.currentIndex);
-  var itemResource = gRDF.GetResource(item.id);
-  
-  openDialog("chrome://mozapps/content/downloads/editAction.xul", "", "modal=yes", itemResource);
-}
-
-# XXXben we should handle this a little better. 
-function showPlugins()
-{
-  openDialog("chrome://browser/content/pref/plugins.xul", "", "modal,resizable");
-}
-
-function toggleDMPrefUI(aCheckbox)
-{
-  if (aCheckbox.checked) 
-    document.getElementById("closeWhenDone").removeAttribute("disabled");
-  else
-    document.getElementById("closeWhenDone").setAttribute("disabled", "true");
-}
-
diff --git a/mozilla/toolkit/mozapps/downloads/content/pref-downloads.xul b/mozilla/toolkit/mozapps/downloads/content/pref-downloads.xul
deleted file mode 100755
index 6236d2f6b8a..00000000000
--- a/mozilla/toolkit/mozapps/downloads/content/pref-downloads.xul
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0"?> 
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.org Code.
-#
-# The Initial Developer of the Original Code is
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Ben Goodger <ben@bengoodger.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/pref/pref.css" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://mozapps/locale/downloads/pref-downloads.dtd" >
-
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://mozapps/content/downloads/pref-downloads.xul');"
-      headertitle="&lHeader;" onunload="uninit();">
-
-  <stringbundle id="strings" src="chrome://mozapps/locale/downloads/unknownContentType.properties"/>
-
-  <script type="application/x-javascript" src="chrome://mozapps/content/downloads/helperApps.js"/>
-  <script type="application/x-javascript" src="chrome://mozapps/content/downloads/pref-downloads.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  
-  <groupbox>
-    <caption label="&askOnSave.label;"/>
-    
-    <radiogroup id="askOnSave" onselect="doEnabling(this.selectedItem);" flex="1"
-                preftype="bool" prefstring="browser.download.useDownloadDir">
-      <radio id="alwaysAsk" label="&alwaysAsk.label;" value="false"/>
-      <hbox flex="1">
-        <radio id="neverAsk" label="&neverAsk.label;" value="true"/>
-        <button id="showFolder" label="&showFolder.label;" oncommand="showFolder();" icon="open"/>
-      </hbox>
-    </radiogroup>
-  </groupbox>
-
-#ifdef MOZ_PHOENIX
-    <groupbox align="start">
-    <caption label="&downloadManagerWindow.label;"/>
-    
-    <checkbox id="showWhenStarting" label="&showWhenStarting.label;" 
-              prefstring="browser.download.manager.showWhenStarting"
-              oncommand="toggleDMPrefUI(event.target);"/>
-    <checkbox id="closeWhenDone" label="&closeWhenDone.label;" class="indent"
-              prefstring="browser.download.manager.closeWhenDone"/>
-  </groupbox>
-#endif
-  
-  <groupbox flex="1">
-    <caption label="&fileTypes.label;"/>
-    
-    <description>&fileTypesDescription.label;</description>
-    <separator class="thin"/>
-
-    <!-- XXX it's really lame that I'm using a content backed tree here rather
-             than one built with treebuilder but for some reason treebuilder is
-             throwing "can't do open ended queries like that!" assertions for
-             no discernible reason -->
-    <vbox class="indent" flex="1">
-      <vbox flex="1" id="fileHandlersListContainer">
-        <tree id="fileHandlersList" flex="1" hidecolumnpicker="true"
-              datasources="rdf:null"
-              onselect="fileHandlerListSelectionChanged();"
-              ondblclick="if (isValidLeftClick(event, 'treechildren')) editFileHandler();">
-
-          <template>
-            <rule>
-              <conditions>
-                <content uri="?uri"/>
-                <triple subject="?uri" 
-                        predicate="http://home.netscape.com/NC-rdf#MIME-types"
-                        object="?MIME-types"/>
-                <member container="?MIME-types" child="?type"/>
-                <triple subject="?type" 
-                        predicate="http://home.netscape.com/NC-rdf#FileType"
-                        object="?file-type"/>
-                <triple subject="?type" 
-                        predicate="http://home.netscape.com/NC-rdf#FileHandler"
-                        object="?file-handler"/>
-                <triple subject="?type" 
-                        predicate="http://home.netscape.com/NC-rdf#FileIcon"
-                        object="?file-icon"/>
-                <triple subject="?type" 
-                        predicate="http://home.netscape.com/NC-rdf#FileHandleAuto"
-                        object="true"/>
-              </conditions>
-              <bindings>
-                <binding subject="?type"
-                        predicate="http://home.netscape.com/NC-rdf#FileExtension"
-                        object="?file-extension"/>
-              </bindings>
-              <action>
-                <treechildren class="extensionChildren">
-                  <treeitem uri="?type">
-                    <treerow>
-                      <treecell label="?file-extension" src="?file-icon"/>
-                      <treecell label="?file-type"/>
-                      <treecell label="?file-handler"/>
-                    </treerow>
-                  </treeitem>
-                </treechildren>
-              </action>
-            </rule>
-          </template>
-
-          <treecols>
-            <treecol id="fileExtension"
-                    class="sortDirectionIndicator" persist="width"
-                    sort="rdf:http://home.netscape.com/NC-rdf#FileExtension"
-                    sortActive="true" sortDirection="none" hideheader="true"/>
-            <treecol id="fileType" flex="1"
-                    class="sortDirectionIndicator" persist="width"
-                    sort="rdf:http://home.netscape.com/NC-rdf#FileType"
-                    sortActive="false" sortDirection="none" hideheader="true"/>
-            <splitter class="tree-splitter" />
-            <treecol id="fileHandler" flex="1"
-                    class="sortDirectionIndicator" persist="width"
-                    sort="rdf:http://home.netscape.com/NC-rdf#FileHandler"
-                    sortActive="false" sortDirection="none" hideheader="true"/>
-          </treecols> <!-- label="&fileHandlerColName.label;" label="&fileTypeColName.label;"  -->
-        </tree>
-      </vbox>
-      
-      <separator class="thin"/>
-      <hbox>
-        <button label="&editFileHandler.label;" accesskey="&editFileHandler.accesskey;"
-                id="editFileHandler" oncommand="editFileHandler();" icon="properties"/>
-        <button label="&removeFileHandler.label;" accesskey="&removeFileHandler.accesskey;"              
-                id="removeFileHandler" oncommand="removeFileHandler();" icon="remove"/>
-#ifdef MOZ_PHOENIX
-        <spring flex="1"/>
-        <button label="&plugins.label;" accesskey="&plugins.accesskey;"
-                id="plugins" oncommand="showPlugins();" icon="properties"/>
-#endif
-      </hbox>
-    </vbox>
-    
-  </groupbox>
-
-  <menulist id="downloadFolderList" flex="1" hidden="true"
-            preftype="int" prefstring="browser.download.folderList" prefdefval="0"
-            oncommand="folderListCommand();">
-    <menupopup>
-      <menuitem value="0" label="&desktop.label;"/>
-      <menuitem value="1" label="&downloads.label;"/>
-      <menuitem value="2" label="" hidden="true" id="downloadFolder" crop="center" flex="1"/>
-      <menuitem value="9" label="&choose.label;"/>
-    </menupopup>
-  </menulist>
-
-</page>
-    
diff --git a/mozilla/toolkit/mozapps/jar.mn b/mozilla/toolkit/mozapps/jar.mn
index 04986e735ca..cdb3767be08 100755
--- a/mozilla/toolkit/mozapps/jar.mn
+++ b/mozilla/toolkit/mozapps/jar.mn
@@ -1,8 +1,6 @@
 toolkit.jar:
 * content/mozapps/downloads/helperApps.js                       (downloads/content/helperApps.js)
 * content/mozapps/downloads/unknownContentType.xul              (downloads/content/unknownContentType.xul)
-* content/mozapps/downloads/pref-downloads.xul                  (downloads/content/pref-downloads.xul)
-* content/mozapps/downloads/pref-downloads.js                   (downloads/content/pref-downloads.js)
 * content/mozapps/downloads/overrideHandler.js                  (downloads/content/overrideHandler.js)
 * content/mozapps/downloads/editAction.xul                      (downloads/content/editAction.xul)
 * content/mozapps/downloads/editAction.js                       (downloads/content/editAction.js)
@@ -20,6 +18,18 @@ toolkit.jar:
 * content/mozapps/extensions/about.xul                          (extensions/content/about.xul)
 * content/mozapps/extensions/about.js                           (extensions/content/about.js)
 * content/mozapps/extensions/finalize.xul                       (extensions/content/finalize.xul)
+* content/mozapps/preferences/actionsshared.js                  (preferences/actionsshared.js)
+* content/mozapps/preferences/ocsp.js                           (preferences/ocsp.js)
+* content/mozapps/preferences/ocsp.xul                          (preferences/ocsp.xul)
+* content/mozapps/preferences/fontbuilder.js                    (preferences/fontbuilder.js)
+* content/mozapps/preferences/fontscaling.js                    (preferences/fontscaling.js)
+* content/mozapps/preferences/fontscaling.xul                   (preferences/fontscaling.xul)
+* content/mozapps/preferences/changemp.js                       (preferences/changemp.js)
+* content/mozapps/preferences/changemp.xul                      (preferences/changemp.xul)
+* content/mozapps/preferences/removemp.js                       (preferences/removemp.js)
+* content/mozapps/preferences/removemp.xul                      (preferences/removemp.xul)
+* content/mozapps/preferences/preferences.css                   (preferences/preferences.css)
+* content/mozapps/preferences/preferences.xml                   (preferences/preferences.xml)
 * content/mozapps/update/update.xul                             (update/content/update.xul)
 * content/mozapps/update/update.js                              (update/content/update.js)
 * content/mozapps/update/updates.xml                            (update/content/updates.xml)
diff --git a/mozilla/browser/components/preferences/actionsshared.js b/mozilla/toolkit/mozapps/preferences/actionsshared.js
old mode 100755
new mode 100644
similarity index 100%
rename from mozilla/browser/components/preferences/actionsshared.js
rename to mozilla/toolkit/mozapps/preferences/actionsshared.js
diff --git a/mozilla/browser/components/preferences/changemp.js b/mozilla/toolkit/mozapps/preferences/changemp.js
similarity index 100%
rename from mozilla/browser/components/preferences/changemp.js
rename to mozilla/toolkit/mozapps/preferences/changemp.js
diff --git a/mozilla/browser/components/preferences/changemp.xul b/mozilla/toolkit/mozapps/preferences/changemp.xul
similarity index 93%
rename from mozilla/browser/components/preferences/changemp.xul
rename to mozilla/toolkit/mozapps/preferences/changemp.xul
index 4ed4a7f8f7f..f3e9ed26bfd 100644
--- a/mozilla/browser/components/preferences/changemp.xul
+++ b/mozilla/toolkit/mozapps/preferences/changemp.xul
@@ -26,7 +26,7 @@
 
 <!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-<!ENTITY % changempDTD SYSTEM "chrome://browser/locale/preferences/changemp.dtd" >
+<!ENTITY % changempDTD SYSTEM "chrome://mozapps/locale/preferences/changemp.dtd" >
 %brandDTD;
 %changempDTD;
 ]>
@@ -37,9 +37,9 @@
         ondialogaccept="setPassword();" 
         onload="init()">
 
-  <script type="application/x-javascript" src="chrome://browser/content/preferences/changemp.js"/>
+  <script type="application/x-javascript" src="chrome://mozapps/content/preferences/changemp.js"/>
 
-  <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
+  <stringbundle id="bundlePreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
 
   <description>&masterPasswordDescription.label;</description>
 
diff --git a/mozilla/browser/components/preferences/fontbuilder.js b/mozilla/toolkit/mozapps/preferences/fontbuilder.js
similarity index 100%
rename from mozilla/browser/components/preferences/fontbuilder.js
rename to mozilla/toolkit/mozapps/preferences/fontbuilder.js
diff --git a/mozilla/browser/components/preferences/fontscaling.js b/mozilla/toolkit/mozapps/preferences/fontscaling.js
similarity index 100%
rename from mozilla/browser/components/preferences/fontscaling.js
rename to mozilla/toolkit/mozapps/preferences/fontscaling.js
diff --git a/mozilla/browser/components/preferences/fontscaling.xul b/mozilla/toolkit/mozapps/preferences/fontscaling.xul
similarity index 94%
rename from mozilla/browser/components/preferences/fontscaling.xul
rename to mozilla/toolkit/mozapps/preferences/fontscaling.xul
index 8c92db8f5a1..9b2ca28db4c 100644
--- a/mozilla/browser/components/preferences/fontscaling.xul
+++ b/mozilla/toolkit/mozapps/preferences/fontscaling.xul
@@ -21,7 +21,7 @@
   
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<!DOCTYPE dialog SYSTEM "chrome://browser/locale/preferences/fontscaling.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/preferences/fontscaling.dtd" >
 
 <dialog id="FontScalingDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -29,7 +29,7 @@
         onload="gFontScalingDialog.init();"
         ondialogaccept="gFontScalingDialog.onAccept();">
 
-  <script type="application/x-javascript" src="chrome://browser/content/preferences/fontscaling.js"/>
+  <script type="application/x-javascript" src="chrome://mozapps/content/preferences/fontscaling.js"/>
 
   <vbox id="horizRuler" width="300" height="30" style="margin: 10px; margin-bottom: 0px">
     <hbox height="10px" style="border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
diff --git a/mozilla/browser/components/preferences/ocsp.js b/mozilla/toolkit/mozapps/preferences/ocsp.js
similarity index 100%
rename from mozilla/browser/components/preferences/ocsp.js
rename to mozilla/toolkit/mozapps/preferences/ocsp.js
diff --git a/mozilla/browser/components/preferences/ocsp.xul b/mozilla/toolkit/mozapps/preferences/ocsp.xul
similarity index 95%
rename from mozilla/browser/components/preferences/ocsp.xul
rename to mozilla/toolkit/mozapps/preferences/ocsp.xul
index 2bdce5c0f08..1934c5cff7a 100644
--- a/mozilla/browser/components/preferences/ocsp.xul
+++ b/mozilla/toolkit/mozapps/preferences/ocsp.xul
@@ -40,7 +40,7 @@
 
 <!DOCTYPE prefwindow [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  <!ENTITY % ocspDTD SYSTEM "chrome://browser/locale/preferences/ocsp.dtd">
+  <!ENTITY % ocspDTD SYSTEM "chrome://toolkit/locale/mozapps/preferences/ocsp.dtd">
   %brandDTD;
   %ocspDTD;
 ]>
@@ -52,7 +52,7 @@
             style="width: 38em !important;">
 
   <prefpane id="OCSPDialogPane" onpaneload="gOCSPDialog.init();">
-    <script type="application/x-javascript" src="chrome://browser/content/preferences/ocsp.js"/>
+    <script type="application/x-javascript" src="chrome://toolkit/content/mozapps/preferences/ocsp.js"/>
 
     <preferences>
       <preference id="security.OCSP.enabled"    name="security.OCSP.enabled"   type="int"/>
diff --git a/mozilla/toolkit/mozapps/preferences/preferences.css b/mozilla/toolkit/mozapps/preferences/preferences.css
new file mode 100644
index 00000000000..2b1cddab5e3
--- /dev/null
+++ b/mozilla/toolkit/mozapps/preferences/preferences.css
@@ -0,0 +1,5 @@
+
+filefield {
+  -moz-binding: url("chrome://mozapps/content/preferences/preferences.xml#fileField");
+}
+
diff --git a/mozilla/browser/components/preferences/preferences.xml b/mozilla/toolkit/mozapps/preferences/preferences.xml
similarity index 98%
rename from mozilla/browser/components/preferences/preferences.xml
rename to mozilla/toolkit/mozapps/preferences/preferences.xml
index c044b42c091..8953b4e4309 100644
--- a/mozilla/browser/components/preferences/preferences.xml
+++ b/mozilla/toolkit/mozapps/preferences/preferences.xml
@@ -7,7 +7,7 @@
 
   <binding id="fileField">
     <content>
-      <xul:stringbundle anonid="bundle" src="chrome://browser/locale/preferences/preferences.properties"/>
+      <xul:stringbundle anonid="bundle" src="chrome://mozapps/locale/preferences/preferences.properties"/>
       <xul:hbox class="fileFieldContentBox" align="center" flex="1">
         <xul:image class="fileFieldIcon" xbl:inherits="src=image"/>
         <xul:textbox class="fileFieldLabel" xbl:inherits="value=label,disabled" flex="1" readonly="true"/>
diff --git a/mozilla/browser/components/preferences/removemp.js b/mozilla/toolkit/mozapps/preferences/removemp.js
similarity index 100%
rename from mozilla/browser/components/preferences/removemp.js
rename to mozilla/toolkit/mozapps/preferences/removemp.js
diff --git a/mozilla/browser/components/preferences/removemp.xul b/mozilla/toolkit/mozapps/preferences/removemp.xul
similarity index 84%
rename from mozilla/browser/components/preferences/removemp.xul
rename to mozilla/toolkit/mozapps/preferences/removemp.xul
index 186e63cd303..640f3842d2e 100644
--- a/mozilla/browser/components/preferences/removemp.xul
+++ b/mozilla/toolkit/mozapps/preferences/removemp.xul
@@ -4,7 +4,7 @@
 
 <!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-<!ENTITY % removempDTD SYSTEM "chrome://browser/locale/preferences/removemp.dtd" >
+<!ENTITY % removempDTD SYSTEM "chrome://mozapps/locale/preferences/removemp.dtd" >
 %brandDTD;
 %removempDTD;
 ]>
@@ -15,9 +15,9 @@
         ondialogaccept="gRemovePasswordDialog.removePassword();" 
         onload="gRemovePasswordDialog.init()">
 
-  <script type="application/x-javascript" src="chrome://browser/content/preferences/removemp.js"/>
+  <script type="application/x-javascript" src="chrome://mozapps/content/preferences/removemp.js"/>
 
-  <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
+  <stringbundle id="bundlePreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
 
   <description>&removeWarning1.label;</description>
   <description class="header">&removeWarning2.label;</description>