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 *****
-
+
@@ -50,7 +50,7 @@
style="width: 36em;"
persist="screenX screenY">
-
+
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"/>
-
+
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">
-
+
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 @@
-
+
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 *****
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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
-# Dan Mosedale
-#
-# 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 @@
-
-# -*- 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
-#
-# 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 *****
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-