some cleanup

browser/app/profile/all.js

@@ -428,8 +428,9 @@ pref("network.prefetch-next", true);
 // post to the server specified by this pref.
 pref("network.hosts.nntp_server",           "news.mozilla.org");
 
-pref("network.image.enable",                true); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
-pref("network.image.enableForOriginatingWebsiteOnly", false);
+// 0-Accept, 1-dontAcceptForeign, 2-dontUse
+user_pref("network.image.imageBehavior",    0);
+
 pref("network.image.warnAboutImages",       false);
 pref("network.proxy.autoconfig_url",        "");
 pref("network.proxy.type",                  0);

browser/app/profile/firebird.js

@@ -428,8 +428,9 @@ pref("network.prefetch-next", true);
 // post to the server specified by this pref.
 pref("network.hosts.nntp_server",           "news.mozilla.org");
 
-pref("network.image.enable",                true); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
-pref("network.image.enableForOriginatingWebsiteOnly", false);
+// 0-Accept, 1-dontAcceptForeign, 2-dontUse
+user_pref("network.image.imageBehavior",    0);
+
 pref("network.image.warnAboutImages",       false);
 pref("network.proxy.autoconfig_url",        "");
 pref("network.proxy.type",                  0);

toolkit/content/nsWidgetStateManager.js

@@ -1,28 +1,28 @@
-/* -*- Mode: Java; tab-width: 2; c-basic-offset: 2; -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- *
- * Contributor(s):
- *   Ben Goodger <ben@netscape.com> (Original Author)
- */
-
-/** Presenting widgetStateManager the Third.
- *   a production of ye olde bard Ben Goodger and his Merry XUL Widget Crewe.
- *  =>> MODIFICATIONS MUST BE REVIEWED BY ben@netscape.com!!! <<=
- **/
+# -*- Mode: Java; tab-width: 2; c-basic-offset: 2; -*-
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@netscape.com> (Original Author)
+#
+#
+# ** Presenting widgetStateManager the Third.
+# *   a production of ye olde bard Ben Goodger and his Merry XUL Widget Crewe.
+# *  =>> MODIFICATIONS MUST BE REVIEWED BY ben@netscape.com!!! <<=
+# **
 
 var wsm;
 

toolkit/jar.mn

@@ -1,14 +1,14 @@
 toolkit.jar:
-*+       content/global/viewZoomOverlay.js                  (content/viewZoomOverlay.js)
 +        content/global/xul.css                             (content/xul.css)
 +        content/global/globalOverlay.js                    (content/globalOverlay.js)
-+        content/global/widgets/toolbar.xml                 (content/widgets/toolbar.xml)
 *+       content/global/finddialog.xul                      (content/finddialog.xul)
 *+       content/global/finddialog.js                       (content/finddialog.js)
 *+       content/global/findUtils.js                        (content/findUtils.js)
 *        content/global/customizeToolbar.xul                (content/customizeToolbar.xul)
 *        content/global/customizeToolbar.js                 (content/customizeToolbar.js)
          content/global/customizeToolbar.css                (content/customizeToolbar.css)
+*+       content/global/nsDragAndDrop.js                    (content/nsDragAndDrop.js)
+*+       content/global/nsWidgetStateManager.js             (content/nsWidgetStateManager.js)
 *+       content/global/viewZoomOverlay.js                  (content/viewZoomOverlay.js)
          content/global/widgets/autocomplete.xml            (content/widgets/autocomplete.xml)
          content/global/widgets/browser.xml                 (content/widgets/browser.xml)
@@ -18,6 +18,7 @@ toolkit.jar:
          content/global/widgets/radio.xml                   (content/widgets/radio.xml)
          content/global/widgets/checkbox.xml                (content/widgets/checkbox.xml)
          content/global/widgets/button.xml                  (content/widgets/button.xml)
+         content/global/widgets/toolbar.xml                 (content/widgets/toolbar.xml)
          content/global/widgets/toolbarbutton.xml           (content/widgets/toolbarbutton.xml)
          content/global/widgets/checkbox.xml                (content/widgets/checkbox.xml)
          content/global/widgets/colorpicker.xml             (content/widgets/colorpicker.xml)
@@ -38,7 +39,6 @@ toolkit.jar:
          content/global/widgets/text.xml                    (content/widgets/text.xml)
          content/global/widgets/tree.xml                    (content/widgets/tree.xml)
          content/global/widgets/wizard.xml                  (content/widgets/wizard.xml)
-*+       content/global/nsDragAndDrop.js                    (content/nsDragAndDrop.js)
          
 en-US.jar:
 +        locale/en-US/global/charset.dtd                    (locale/charset.dtd)