283639 - sanitize does not work when confirm dialog is shown, also correct licenses

browser/base/content/sanitize.xul

@@ -38,7 +38,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 
-<!DOCTYPE dialog [
+<!DOCTYPE prefwindow [
   <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
   <!ENTITY % sanitizeDTD SYSTEM "chrome://browser/locale/sanitize.dtd">
   %brandDTD;

browser/components/preferences/content.js

@@ -11,14 +11,14 @@
 # for the specific language governing rights and limitations under the
 # License.
 # 
-# The Original Code is Mozilla.org Code.
+# The Original Code is the Firefox Preferences System.
 # 
-# The Initial Developer of the Original Code is
+# The Initial Developer of the Original Code is Google Inc.
-# Doron Rosenberg.
+# Portions created by the Initial Developer are Copyright (C) 2005
-# Portions created by the Initial Developer are Copyright (C) 2001
 # the Initial Developer. All Rights Reserved.
 # 
 # Contributor(s):
+#   Ben Goodger <ben@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
@@ -34,6 +34,7 @@
 # 
 # ***** END LICENSE BLOCK *****
 
+
 const kFontNameFmtSerif         = "font.name.serif.%LANG%";
 const kFontNameFmtSansSerif     = "font.name.sans-serif.%LANG%";
 const kFontNameListFmtSerif     = "font.name-list.serif.%LANG%";

browser/components/preferences/removemp.js

@@ -1,4 +1,38 @@
-
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# 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 the Firefox Preferences System.
+# 
+# The Initial Developer of the Original Code is Google Inc.
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Ben Goodger <ben@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 *****
 
 var gRemovePasswordDialog = {
   _token    : null,

toolkit/content/widgets/preferences.xml

@@ -771,31 +771,33 @@
             // Clone all the preferences elements from the child document and
             // insert them into the pane collection of the parent. 
             var pdoc = window.opener.document;
-            var currentPane = pdoc.documentElement.currentPane;
+            if (pdoc.documentElement.localName == "prefwindow") {
-            var id = window.location.href + "#childprefs";
+              var currentPane = pdoc.documentElement.currentPane;
-            var childPrefs = pdoc.getElementById(id);
+              var id = window.location.href + "#childprefs";
-            if (!childPrefs) {
+              var childPrefs = pdoc.getElementById(id);
-              var childPrefs = pdoc.createElement("preferences");
+              if (!childPrefs) {
-              currentPane.appendChild(childPrefs);
+                var childPrefs = pdoc.createElement("preferences");
-              childPrefs.id = id;
+                currentPane.appendChild(childPrefs);
-            }
+                childPrefs.id = id;
-            var panes = this.preferencePanes;
+              }
-            for (var i = 0; i < panes.length; ++i) {
+              var panes = this.preferencePanes;
-              var preferences = panes[i].preferences;
+              for (var i = 0; i < panes.length; ++i) {
-              for (var j = 0; j < preferences.length; ++j) {
+                var preferences = panes[i].preferences;
-                var prefID = window.location.href + "#" + preferences[j].id;
+                for (var j = 0; j < preferences.length; ++j) {
-                var preference = pdoc.getElementById(prefID);
+                  var prefID = window.location.href + "#" + preferences[j].id;
-                if (!preference) {
+                  var preference = pdoc.getElementById(prefID);
-                  var preference = pdoc.createElement("preference");
+                  if (!preference) {
-                  childPrefs.appendChild(preference);
+                    var preference = pdoc.createElement("preference");
-                  preference.id       = prefID;
+                    childPrefs.appendChild(preference);
-                  preference.name     = preferences[j].name;
+                    preference.id       = prefID;
-                  preference.type     = preferences[j].type;
+                    preference.name     = preferences[j].name;
-                  preference.inverted = preferences[j].inverted;
+                    preference.type     = preferences[j].type;
-                  preference.readonly = preferences[j].readonly;
+                    preference.inverted = preferences[j].inverted;
-                  preference.disabled = preferences[j].disabled;
+                    preference.readonly = preferences[j].readonly;
+                    preference.disabled = preferences[j].disabled;
+                  }
+                  preference.value    = preferences[j].value;
                 }
-                preference.value    = preferences[j].value;
               }
             }
           }