Bug 427817: remove files obsoleted by pref panel migration; r=iann, sr=neil
authorKarsten Düsterloh <mnyromyr@tprac.de>
Wed, 24 Sep 2008 20:27:55 +0200
changeset 425 c794f257143c648d6ece4e14fcfc6215e3e53dd6
parent 424 5a4f971651a772d705170a38e2a3d1210cd45892
child 426 03197e388cfd25df2b8ab786b460ee0af5eb513c
push idunknown
push userunknown
push dateunknown
reviewersiann, neil
bugs427817
Bug 427817: remove files obsoleted by pref panel migration; r=iann, sr=neil
editor/ui/composer/content/editorPrefsOverlay.xul
editor/ui/jar.mn
mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
mailnews/base/resources/content/manifest.rdf
mailnews/compose/resources/content/MsgComposeCommands.js
mailnews/jar.mn
suite/browser/navigatorOverlay.xul
suite/common/bindings/prefwindow.xml
suite/common/jar.mn
suite/common/pref/nsPrefWindow.js
suite/common/pref/pref-help.js
suite/common/pref/pref.xul
suite/common/pref/preferences.xul
suite/common/pref/preftree.xul
suite/common/utilityOverlay.js
suite/debugQA/content/debugQAPrefsOverlay.xul
suite/debugQA/jar.mn
suite/locales/en-US/chrome/common/pref/PrefsOverlay.dtd
suite/locales/en-US/chrome/common/pref/pref.dtd
suite/locales/en-US/chrome/common/pref/preftree.dtd
suite/locales/jar.mn
suite/security/jar.mn
suite/security/prefs/PrefOverlay.xul
--- a/editor/ui/composer/content/editorPrefsOverlay.xul
+++ b/editor/ui/composer/content/editorPrefsOverlay.xul
@@ -43,30 +43,9 @@
                   label="&toolbars.label;"
                   prefpane="toolbars_pane"
                   url="chrome://editor/content/pref-toolbars.xul"
                   helpTopic="composer_prefs_toolbars"/>
       </treechildren>
     </treeitem>
   </treechildren>
 
-  <!-- category tree entries for editor -->
-  <treechildren id="panelChildren">
-    <treeitem container="true" id="editor" insertafter="mailnews,navigator">
-      <treerow>       
-        <treecell label="Migrated: &compose.label;"/> 
-      </treerow>
-      <treechildren>
-        <treeitem>
-          <treerow>
-            <treecell label="Migrated: &editing.label;"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="Migrated: &toolbars.label;"/> 
-          </treerow>
-        </treeitem>  
-      </treechildren>
-    </treeitem>
-  </treechildren>
-           
 </overlay>         
--- a/editor/ui/jar.mn
+++ b/editor/ui/jar.mn
@@ -1,14 +1,13 @@
 comm.jar:
 % content editor %content/editor/ xpcnativewrappers=yes
 % overlay chrome://communicator/content/tasksOverlay.xul chrome://editor/content/editorTasksOverlay.xul
 % overlay chrome://messenger/content/mailWindowOverlay.xul chrome://editor/content/editorMailOverlay.xul
 #ifdef MOZ_SUITE
-% overlay chrome://communicator/content/pref/preftree.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/preferences.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-appearance.xul chrome://editor/content/editorPrefsOverlay.xul
 % overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul
 % content editor-region %content/editor-region/ xpcnativewrappers=yes
 #endif
       content/editor/editor.xul                                (composer/content/editor.xul) 
       content/editor/editor.js                                 (composer/content/editor.js) 
       content/editor/publishprefs.js                           (composer/content/publishprefs.js) 
--- a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
+++ b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
@@ -60,17 +60,16 @@
     <treeitem container="true"
               id="mailnewsItem"
               insertafter="navigator"
               label="&mail.label;"
               prefpane="mailnews_pane"
               url="chrome://messenger/content/pref-mailnews.xul"
               helpTopic="mail_prefs_general">
       <treechildren id="messengerChildren">
-        <!-- XXX Move pref panes from below to here as they are migrated -->
         <treeitem id="viewingMessagesItem"
                   label="&viewingMessages.label;"
                   prefpane="viewing_messages_pane"
                   url="chrome://messenger/content/pref-viewing_messages.xul"
                   helpTopic="mail_prefs_display"/>
         <treeitem id="notificationsItem"
                   label="&notifications.label;"
                   prefpane="notifications_pane"
@@ -115,71 +114,9 @@
                   label="&offline.label;"
                   prefpane="offline_pane"
                   url="chrome://messenger/content/pref-offline.xul"
                   helpTopic="mail_prefs_offline"/>
       </treechildren>
     </treeitem>
   </treechildren>
 
-  <!-- category tree entries for mail/news -->
-  <treechildren id="panelChildren">
-    <treeitem container="true" id="mailnews" insertafter="navigator">
-      <treerow>
-        <treecell label="(Migrated: &mail.label;)"/>
-      </treerow>
-      <!-- XXX Move these up as we migrate the panels -->
-      <treechildren id="messengerChildren">
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &viewingMessages.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &notifications.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem id="mailcomposepref">
-          <treerow>
-            <treecell label="(Migrated: &composingMessages.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &format.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &address.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &junk.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem id="mailtagspref">
-          <treerow>
-            <treecell label="(Migrated: &tags.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &return.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &characterEncoding.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &offline.label;)"/>
-          </treerow>
-        </treeitem>
-      </treechildren>
-    </treeitem>
-  </treechildren>
- 
 </overlay>
deleted file mode 100644
--- a/mailnews/base/resources/content/manifest.rdf
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
-    <RDF:li resource="chrome://communicator/content/pref/pref-advanced.xul"/>
-    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
-    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
-    <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
-    <RDF:li resource="chrome://editor/content/editor.xul"/>
-  </RDF:Seq>
-
-
-  <!-- messenger preferences branches -->
-  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger startup pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger js toggle pref -->
-  <RDF:Seq about="chrome://communicator/content/pref/pref-advanced.xul">
-    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger taskbar/tasks menu items -->
-  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Navigator -->
-  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
-    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Messenger -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-  <!-- messenger items for Mail Compose -->
-  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
-    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <!-- messenger items for Addressbook -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
-    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-  <!-- messenger items for Select Addresses dialog -->
-  <RDF:Seq about="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul">
-    <RDF:li>chrome://messenger/content/mailOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-
-  <!-- messenger items for Composer -->
-  <RDF:Seq about="chrome://editor/content/editor.xul">
-    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
-  </RDF:Seq>
-  
-</RDF:RDF>
--- a/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -1058,17 +1058,17 @@ function DoCommandPrint()
 {
   try {
     PrintUtils.print();
   } catch(ex) {dump("#PRINT ERROR: " + ex + "\n");}
 }
 
 function DoCommandPreferences()
 {
-  goPreferences('mailnews', 'chrome://messenger/content/messengercompose/pref-composing_messages.xul', 'mailcomposepref');
+  goPreferences('composing_messages_pane');
 }
 
 function ToggleWindowLock()
 {
   gWindowLocked = !gWindowLocked;
   updateComposeItems();
 }
 
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -1,15 +1,14 @@
 #ifdef MOZ_SUITE
 messenger.jar:
 % content messagebody %content/messagebody/ contentaccessible=yes
 % content messenger %content/messenger/ xpcnativewrappers=yes
 % override chrome://messagebody/skin/messageBody.css chrome://messenger/skin/messageBody.css
 % content messenger-region %content/messenger-region/
-% overlay chrome://communicator/content/pref/preftree.xul                      chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/preferences.xul                   chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
 % overlay chrome://navigator/content/navigatorOverlay.xul                      chrome://messenger/content/mailOverlay.xul
 % overlay chrome://messenger/content/messenger.xul                             chrome://messenger/content/mailMessengerOverlay.xul
 % overlay chrome://messenger/content/messengercompose/messengercompose.xul     chrome://messenger/content/mailMessengerComposeOverlay.xul
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -392,17 +392,16 @@
         <menuitem id="menu_findTypeLinks"/>
         <menuitem id="menu_findTypeText"/>
 
         <menuseparator id="textfieldDirection-separator" hidden="true"/>
         <menuitem id="textfieldDirection-swap" hidden="true"/>
 
         <menuseparator id="menu_PrefsSeparator"/> 
         <menuitem id="menu_preferences" oncommand="goPreferences('navigator_pane')"/>
-        <menuitem label="(Legacy Prefwindow...)" oncommand="goPreferences('navigator', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator')"/>
       </menupopup>
     </menu>
 
     <menu id="menu_View" accesskey="&viewMenu.accesskey;" label="&viewMenu.label;">
       <menupopup id="menu_View_Popup">
         <menu label="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="menu_Toolbars">
           <menupopup id="view_toolbars_popup" onpopupshowing="updateToolbarStates(this);"> 
             <menuitem label="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" observes="cmd_viewnavbar"  />
--- a/suite/common/bindings/prefwindow.xml
+++ b/suite/common/bindings/prefwindow.xml
@@ -83,17 +83,17 @@
     Also, the <tree> will get the class "prefnavtree" added, so that it may be
     prestyled by the SeaMonkey themes.
     Setting <prefwindow xpfe="false"> will enforce the application of just the
     basic toolkit <prefwindow> even in SeaMonkey. The same "xpfe" attribute
     exists for <prefpane>, too.
 -->
 
 <!DOCTYPE bindings [
-  <!ENTITY % dtd1 SYSTEM "chrome://communicator/locale/pref/pref.dtd"> %dtd1;
+  <!ENTITY % dtd1 SYSTEM "chrome://communicator/locale/pref/preftree.dtd"> %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd"> %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://global/locale/preferences.dtd"> %dtd3;
 ]>
 
 <bindings id="prefwindowBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/suite/common/jar.mn
+++ b/suite/common/jar.mn
@@ -131,27 +131,18 @@ comm.jar:
    content/communicator/permissions/cookieViewer.js                 (permissions/cookieViewer.js)
    content/communicator/permissions/cookieViewer.xul                (permissions/cookieViewer.xul)
    content/communicator/permissions/imageContextOverlay.xul         (permissions/imageContextOverlay.xul)
    content/communicator/permissions/permissionsManager.js           (permissions/permissionsManager.js)
    content/communicator/permissions/permissionsManager.xul          (permissions/permissionsManager.xul)
    content/communicator/permissions/permissionsNavigatorOverlay.xul (permissions/permissionsNavigatorOverlay.xul)
    content/communicator/permissions/permissionsOverlay.js           (permissions/permissionsOverlay.js)
    content/communicator/permissions/treeUtils.js                    (permissions/treeUtils.js)
-# preferences.xul will replace all the files marked below, once we have migrated all our pref panels
-# to toolkit style - begone, foul spirits of the past!
    content/communicator/pref/preferences.xul                        (pref/preferences.xul)
    content/communicator/pref/preferences.js                         (pref/preferences.js)
-# files deprecated by preferences.xul: begin
-   content/communicator/pref/nsPrefWindow.js                        (pref/nsPrefWindow.js)
-   content/communicator/pref/nsWidgetStateManager.js                (/mozilla/xpfe/global/resources/content/nsWidgetStateManager.js)
-   content/communicator/pref/pref.xul                               (pref/pref.xul)
-   content/communicator/pref/preftree.xul                           (pref/preftree.xul)
-   content/communicator/pref/pref-help.js                           (pref/pref-help.js)
-# files deprecated by preferences.xul: end
    content/communicator/pref/prefpanels.css                         (pref/prefpanels.css)
    content/communicator/pref/prefpanels.xml                         (pref/prefpanels.xml)
    content/communicator/pref/pref-advanced.js                       (pref/pref-advanced.js)
    content/communicator/pref/pref-advanced.xul                      (pref/pref-advanced.xul)
    content/communicator/pref/pref-appearance.js                     (pref/pref-appearance.js)
    content/communicator/pref/pref-appearance.xul                    (pref/pref-appearance.xul)
    content/communicator/pref/pref-applications.xul                  (pref/pref-applications.xul)
 *  content/communicator/pref/pref-applications.js                   (pref/pref-applications.js)
deleted file mode 100644
--- a/suite/common/pref/nsPrefWindow.js
+++ /dev/null
@@ -1,428 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; 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
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Ben "Count XULula" Goodger <ben@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of 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 ***** */
-
-const _DEBUG = false; 
- 
-/** PrefWindow IV
- *  =============
- *  This is a general page switcher and pref loader.
- *  =>> CHANGES MUST BE REVIEWED BY ben@netscape.com!! <<=
- **/ 
-
-var hPrefWindow = null;
-var queuedTag; 
-
-function initPanel ( aPrefTag )
-  {
-    if( hPrefWindow )
-      hPrefWindow.onpageload( aPrefTag )
-    else
-      queuedTag = aPrefTag;
-  } 
-
-function onLoad()
-{
-  hPrefWindow = new nsPrefWindow('panelFrame');
-
-  if (!hPrefWindow)
-    throw "failed to create prefwindow";
-  else
-    hPrefWindow.init();
-}
-
-function nsPrefWindow( frame_id )
-{
-  if ( !frame_id )
-    throw "Error: frame_id not supplied!";
-
-  this.contentFrame   = frame_id
-  this.wsm            = new nsWidgetStateManager( frame_id );
-  this.wsm.attributes = ["preftype", "prefstring", "prefattribute", "disabled"];
-  this.pref           = null;
-  this.chromeRegistry = null;
-  this.observerService= null;
-  
-  this.cancelHandlers = [];
-  this.okHandlers     = [];  
-
-  // if there is a system pref switch
-  this.pagePrefChanged = false;
-  // the set of pages, which are updated after a system pref switch
-  this.pagePrefUpdated = [];
-
-  // set up window
-  this.onload();
-}
-
-nsPrefWindow.prototype =
-  {
-    onload:
-      function ()
-        {
-          try 
-            {
-              this.pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefService).getBranch(null);
-              this.chromeRegistry = Components.classes["@mozilla.org/chrome/chrome-registry;1"].getService(Components.interfaces.nsIChromeRegistrySea);
-              this.observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
-            }
-          catch(e) 
-            {
-              dump("*** Failed to create prefs object\n");
-              return;
-            }
-        },
-
-      init: 
-        function ()
-          {        
-            if( window.queuedTag )
-                this.onpageload( window.queuedTag );
-  
-            if( window.arguments[1] )
-              this.openBranch( window.arguments[1], window.arguments[2] );
-          },
-                  
-      onAccept:
-        function ()
-          {
-            var tag = document.getElementById( hPrefWindow.contentFrame ).getAttribute("tag");
-            if( tag == "" )
-                tag = document.getElementById( hPrefWindow.contentFrame ).getAttribute("src");
-            hPrefWindow.wsm.savePageData( tag );
-            for( var i = 0; i < hPrefWindow.okHandlers.length; i++ )
-              try {
-                hPrefWindow.okHandlers[i]();
-              } catch (e) {
-                dump("some silly ok handler /*"+hPrefWindow.okHandlers[i]+"*/ failed: "+ e);
-              }
-            hPrefWindow.savePrefs();
-
-            return true;
-          },
-        
-      onCancel:
-        function ()
-          {
-            for( var i = 0; i < hPrefWindow.cancelHandlers.length; i++ )
-              try {
-                hPrefWindow.cancelHandlers[i]();
-              } catch (e) {
-                dump("some silly cancel handler /*"+hPrefWindow.cancelHandlers[i]+"*/ failed: "+ e);
-              }
-
-            return true;
-          },
-
-      registerOKCallbackFunc:
-        function ( aFunctionReference )
-          { 
-            this.okHandlers[this.okHandlers.length] = aFunctionReference;
-          },
-
-      registerCancelCallbackFunc:
-        function ( aFunctionReference )
-          {
-            this.cancelHandlers[this.cancelHandlers.length] = aFunctionReference;
-          },
-      getPrefIsLocked:
-        function ( aPrefString )
-          {
-            return this.pref.prefIsLocked(aPrefString);
-          },
-      getPref:
-        function ( aPrefType, aPrefString )
-          {
-            try
-              {
-                switch ( aPrefType )
-                  {
-                    case "bool":
-                      return this.pref.getBoolPref( aPrefString );
-                    case "int":
-                      return this.pref.getIntPref( aPrefString );
-                    case "localfile":
-                      return this.pref.getComplexValue( aPrefString, Components.interfaces.nsILocalFile);
-                    case "localizedstring":
-                      return this.pref.getComplexValue( aPrefString, Components.interfaces.nsIPrefLocalizedString ).data;
-                    case "color":
-                    case "string":
-                    default:
-                       return this.pref.getComplexValue( aPrefString, Components.interfaces.nsISupportsString ).data;
-                  }
-              }
-            catch (e)
-              {
-                if( _DEBUG ) 
-                  {
-                    dump("*** no default pref for " + aPrefType + " pref: " + aPrefString + "\n");
-                    dump(e + "\n");
-                  }
-              }
-            return "!/!ERROR_UNDEFINED_PREF!/!";
-          }    ,
-
-      setPref:
-        function ( aPrefType, aPrefString, aValue )
-          {
-            try
-              {
-                switch ( aPrefType )
-                  {
-                    case "bool":
-                      this.pref.setBoolPref( aPrefString, aValue );
-                      break;
-                    case "int":
-                      this.pref.setIntPref( aPrefString, aValue );
-                      break;
-                    case "localfile":
-                      this.pref.setComplexValue( aPrefString, Components.interfaces.nsILocalFile, aValue );
-                      break;
-                    case "color":
-                    case "string":
-                    case "localizedstring":
-                    default:
-                      var supportsString = Components.classes["@mozilla.org/supports-string;1"].createInstance(Components.interfaces.nsISupportsString);
-                      supportsString.data = aValue;
-                      this.pref.setComplexValue( aPrefString, Components.interfaces.nsISupportsString, supportsString );
-                      break;
-                  }
-              }
-            catch (e)
-              {
-                dump(e + "\n");
-              }
-          },
-          
-      savePrefs:
-        function ()
-          {
-            for( var pageTag in this.wsm.dataManager.pageData )
-              {
-                var pageData = this.wsm.dataManager.getPageData( pageTag );
-                if ("initialized" in pageData && pageData.initialized)
-                  {
-                if ( "elementIDs" in pageData )
-                  pageData = pageData.elementIDs;
-                for( var elementID in pageData )
-                  {
-                    if (elementID == "initialized") continue;
-                    var itemObject = pageData[elementID];
-                    if (typeof(itemObject) != "object") break;
-                    if ( "prefstring" in itemObject && itemObject.prefstring )
-                      {
-                        var elt = itemObject.localname;
-                        var prefattribute = itemObject.prefattribute;
-                        if (!prefattribute) {
-                          if (elt == "radiogroup" || elt == "textbox" || elt == "menulist")
-                            prefattribute = "value";
-                          else if (elt == "checkbox" || elt == "listitem")
-                            prefattribute = "checked";
-                          else if (elt == "colorpicker")
-                            prefattribute = "color";
-                          else if (elt == "button")
-                            prefattribute = "disabled";
-                        }
-                        
-                        var value = itemObject[prefattribute];
-                        var preftype = itemObject.preftype;
-                        if (!preftype) {
-                          if (elt == "textbox" || elt == "colorpicker")
-                            preftype = "string";
-                          else if (elt == "checkbox" || elt == "listitem" || elt == "button")
-                            preftype = "bool";
-                          else if (elt == "radiogroup" || elt == "menulist")
-                            preftype = "int";
-                        }
-                        switch( preftype )
-                          {
-                            case "bool":
-                              if( value == "true" && typeof(value) == "string" )
-                                value = true;
-                              else if( value == "false" && typeof(value) == "string" )
-                                value = false;
-                              break;
-                            case "int":
-                              value = parseInt(value, 10);                              
-                              break;
-                            case "color":
-                              if( toString(value) == "" )
-                                {
-                                  dump("*** ERROR CASE: illegal attempt to set an empty color pref. ignoring.\n");
-                                  break;
-                                }
-                            case "string":
-                            case "localizedstring":
-                            default:
-                              if( typeof(value) != "string" )
-                                  value = toString(value);
-                              break;
-                          }
-
-                        // the pref is not saved, if the pref value is not
-                        // changed or the pref is locked.
-                        if( !this.getPrefIsLocked(itemObject.prefstring) &&
-                           (value != this.getPref( preftype, itemObject.prefstring)))
-                            this.setPref( preftype, itemObject.prefstring, value );
-                      }
-                  }
-              }
-              }
-              try 
-                {
-                  Components.classes["@mozilla.org/preferences-service;1"]
-                            .getService(Components.interfaces.nsIPrefService)
-                            .savePrefFile(null);
-                }
-              catch (e)
-                {
-                  try
-                    {
-                      var prefUtilBundle = document.getElementById("bundle_prefutilities");
-                      var alertText = prefUtilBundle.getString("prefSaveFailedAlert");
-                      var titleText = prefUtilBundle.getString("prefSaveFailedTitle");
-                      var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
-                                                    .getService(Components.interfaces.nsIPromptService);
-                      promptService.alert(window, titleText, alertText);
-                    }
-                  catch (e)
-                    {
-                      dump(e + "\n");
-                    }
-                }
-          },                        
-
-      switchPage:
-        function ()
-          {
-            var prefPanelTree = document.getElementById( "prefsTree" );
-            var selectedItem = prefPanelTree.contentView.getItemAtIndex(prefPanelTree.currentIndex);
-
-            var oldURL = document.getElementById( this.contentFrame ).getAttribute("tag");
-            if( !oldURL )
-                oldURL = document.getElementById( this.contentFrame ).getAttribute("src");
-            this.wsm.savePageData( oldURL );      // save data from the current page. 
-            var newURL = selectedItem.firstChild.firstChild.getAttribute("url");
-            var newTag = selectedItem.firstChild.firstChild.getAttribute("tag");
-            if( newURL != oldURL )
-              {
-                document.getElementById( this.contentFrame ).setAttribute( "src", newURL );
-                if( !newTag )
-                  document.getElementById( this.contentFrame ).removeAttribute( "tag" );
-                else
-                  document.getElementById( this.contentFrame ).setAttribute( "tag", newTag );
-              }
-          },
-              
-      onpageload: 
-        function ( aPageTag )
-          {
-            var header = document.getElementById("header");
-            header.setAttribute("title",
-                                window.frames[this.contentFrame].document.documentElement.getAttribute("headertitle"));
-
-            // update widgets states when it is first loaded, or there are
-            // system pref switch. (i.e., to refect the changed lock status).
-            if(!(aPageTag in this.wsm.dataManager.pageData) ||
-               (this.pagePrefChanged && (!(aPageTag in this.pagePrefUpdated))))
-              {
-                var prefElements = window.frames[this.contentFrame].document.getElementsByAttribute( "prefstring", "*" );
-				if (this.pagePrefChanged)
-         			this.pagePrefUpdated[aPageTag] = [];
-                this.wsm.dataManager.getPageData( aPageTag );
-                for( var i = 0; i < prefElements.length; i++ )
-                  {
-                    var prefstring    = prefElements[i].getAttribute( "prefstring" );
-                    var prefid        = prefElements[i].getAttribute( "id" );
-                    var preftype      = prefElements[i].getAttribute( "preftype" );
-                    var elt = prefElements[i].localName;
-                    if (!preftype) {
-                      if (elt == "textbox" || elt == "colorpicker")
-                        preftype = "string";
-                      else if (elt == "checkbox" || elt == "listitem" || elt == "button")
-                        preftype = "bool";
-                      else if (elt == "radiogroup" || elt == "menulist")
-                        preftype = "int";
-                    }
-                    var prefdefval    = prefElements[i].getAttribute( "prefdefval" );
-                    var prefattribute = prefElements[i].getAttribute( "prefattribute" );
-                    if (!prefattribute) {
-                      if (elt == "radiogroup" || elt == "textbox" || elt == "menulist")
-                        prefattribute = "value";
-                      else if (elt == "checkbox" || elt == "listitem")
-                        prefattribute = "checked";
-                      else if (elt == "colorpicker")
-                        prefattribute = "color";
-                      else if (elt == "button")
-                        prefattribute = "disabled";
-                    }
-                    var prefvalue = this.getPref( preftype, prefstring );
-                    if( prefvalue == "!/!ERROR_UNDEFINED_PREF!/!" )
-                        prefvalue = prefdefval;
-                    var root = this.wsm.dataManager.getItemData( aPageTag, prefid ); 
-                    root[prefattribute] = prefvalue;              
-                    var isPrefLocked = this.getPrefIsLocked(prefstring);
-                    if (isPrefLocked)
-                      root.disabled = "true";
-                    root.localname = prefElements[i].localName;
-                  }
-              }      
-            this.wsm.setPageData( aPageTag );  // do not set extra elements, accept hard coded defaults
-            
-            if( 'Startup' in window.frames[ this.contentFrame ])
-                window.frames[ this.contentFrame ].Startup();
-
-            this.wsm.dataManager.pageData[aPageTag].initialized=true;
-          },
-
-    openBranch:
-      function ( aComponentName, aSelectItem )
-        {
-          var panelTree = document.getElementById( "prefsTree" );
-          var selectItem = document.getElementById( aSelectItem );
-          var selectItemroot = document.getElementById( aComponentName );
-          var parentIndex = panelTree.contentView.getIndexOfItem( selectItemroot );
-          if (parentIndex != -1 && !panelTree.view.isContainerOpen(parentIndex))
-             panelTree.view.toggleOpenState(parentIndex);
-          var index = panelTree.view.getIndexOfItem( selectItem );
-          if (index == -1)
-            return;
-          panelTree.view.selection.select( index );
-        }
-
-  };
deleted file mode 100644
--- a/suite/common/pref/pref-help.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// these are keys for resolving the preferences dialog subframe
-// in terms of the context-sensitive help that should be loaded
-// from the help button. The "mail_prefs_display" things given
-// here represent (for the help window itself) the help content.
-var fm = {
-  "chrome://communicator/content/pref/pref-appearance.xul": "appearance_pref", 
-  "chrome://communicator/content/pref/pref-fonts.xul": "appearance_pref_fonts", 
-  "chrome://communicator/content/pref/pref-colors.xul": "appearance_pref_colors", 
-  "chrome://communicator/content/pref/pref-themes.xul": "appearance_pref_themes", 
-  "chrome://communicator/content/pref/pref-locales.xul": "appearance_pref_locales",
-  "chrome://communicator/content/pref/pref-navigator.xul": "navigator_pref_navigator",
-  "chrome://communicator/content/pref/pref-history.xul": "navigator_pref_history",
-  "chrome://communicator/content/pref/pref-languages.xul": "navigator_pref_languages",
-  "chrome://communicator/content/pref/pref-applications.xul": "navigator_pref_helper_applications",
-  "chrome://communicator/content/pref/pref-smart_browsing.xul": "navigator_pref_smart_browsing",
-  "chrome://communicator/content/pref/pref-search.xul": "navigator_pref_internet_searching",
-  "chrome://communicator/content/pref/pref-scripts.xul": "advanced_pref_scripts",
-  "chrome://messenger/content/pref-mailnews.xul": "mail_prefs_general",
-  "chrome://messenger/content/pref-viewing_messages.xul": "mail_prefs_display",
-  "chrome://messenger/content/pref-character_encoding.xul": "mail_prefs_character_encoding",
-  "chrome://messenger/content/pref-notifications.xul": "mail_prefs_notifications",
-  "chrome://messenger/content/messengercompose/pref-composing_messages.xul": "mail_prefs_messages",
-  "chrome://messenger/content/messengercompose/pref-formatting.xul": "mail_prefs_formatting",
-  "chrome://messenger/content/addressbook/pref-addressing.xul": "mail_prefs_addressing",
-  "chrome://messenger/content/pref-offline.xul": "mail_prefs_offline",
-  "chrome://messenger/content/pref-junk.xul": "mail-prefs-junk",
-  "chrome://messenger/content/pref-tags.xul": "mail-prefs-tags",
-  "chrome://messenger/content/pref-receipts.xul": "mail-prefs-receipts",
-  "chrome://editor/content/pref-composer.xul": "composer_prefs_general",
-  "chrome://editor/content/pref-editing.xul":  "composer_prefs_newpage",
-  "chrome://editor/content/pref-toolbars.xul":  "composer_prefs_toolbars",
-  "chrome://communicator/content/pref/pref-security.xul": "sec_gen",
-  "chrome://communicator/content/pref/pref-cookies.xul": "cookies_prefs",
-  "chrome://communicator/content/pref/pref-images.xul": "images_prefs",
-  "chrome://communicator/content/pref/pref-popups.xul": "pop_up_blocking",
-  "chrome://wallet/content/pref-wallet.xul": "forms_prefs",
-  "chrome://pippki/content/pref-masterpass.xul": "passwords_master",
-  "chrome://wallet/content/pref-passwords.xul": "passwords_prefs",
-  "chrome://pippki/content/pref-ssl.xul": "ssl_prefs",
-  "chrome://pippki/content/pref-certs.xul": "certs_prefs",
-  "chrome://pippki/content/pref-validation.xul": "validation_prefs",
-  "chrome://communicator/content/pref/pref-advanced.xul": "advanced_pref_advanced",
-  "chrome://communicator/content/pref/pref-cache.xul": "advanced_pref_cache",
-  "chrome://communicator/content/pref/pref-debug.xul": "debug",
-  "chrome://communicator/content/pref/pref-debug1.xul": "debug_event",
-  "chrome://communicator/content/pref/pref-debug2.xul": "debug_network",
-  "chrome://communicator/content/pref/pref-http.xul": "advanced_http_networking",
-  "chrome://communicator/content/pref/pref-inspector.xul": "inspector",
-  "chrome://communicator/content/pref/pref-download.xul": "navigator_pref_downloads",
-  "chrome://communicator/content/pref/pref-mousewheel.xul": "advanced_pref_mouse_wheel",
-  "chrome://communicator/content/pref/pref-smartupdate.xul": "advanced_pref_installation",
-  "chrome://communicator/content/pref/pref-tabs.xul": "navigator_pref_tabbed_browsing",
-  "chrome://communicator/content/pref/pref-proxies.xul": "advanced_pref_proxies",
-  "chrome://communicator/content/pref/pref-keynav.xul":  "advanced_pref_keyboard_nav",
-  "chrome://sroaming/content/prefs/top.xul": "profile-help-roaming-prefs",
-  "chrome://sroaming/content/prefs/files.xul": "profile-help-roaming-item-selection"
-} 
-
-function doHelpButton() {
-  var topic = "prefs";
-  var subsrc = document.getElementById("panelFrame").getAttribute("src");
-  if (subsrc in fm)
-    topic = fm[subsrc];
-  openHelp(topic, "chrome://communicator/locale/help/suitehelp.rdf");
-}
-
deleted file mode 100644
--- a/suite/common/pref/pref.xul
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
-
-<?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>
-
-<!DOCTYPE dialog [
-  <!ENTITY % dtd1 SYSTEM "chrome://communicator/locale/pref/pref.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd" > %dtd2;
-]>
-
-
-<!-- This dialog has a fixed size and is not resizable. 
-     You MAY NOT increase the size of this dialog. 
-     Questions, Comments -> ben@netscape.com -->
-<dialog id="prefDialog" 
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&prefWindow.title;" 
-        style="&prefWindow.size;"
-        windowtype="mozilla:preferences"
-        buttons="accept,cancel,help"
-        onload="onLoad();"
-        ondialogaccept="return hPrefWindow.onAccept();"
-        ondialogcancel="return hPrefWindow.onCancel();"
-        ondialoghelp="doHelpButton();"
-        persist="screenX screenY"> 
-
-  <stringbundle id="bundle_prefutilities"
-               src="chrome://communicator/locale/pref/prefutilities.properties"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/nsWidgetStateManager.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-help.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-
-  <hbox flex="1">
-    <vbox>
-      <label value="&categoryHeader;" control="prefsTree"/>
-      <!-- tree sidebar -->
-      <tree id="prefsTree" style="width: 13em;" flex="1"/>
-    </vbox>
-    <vbox flex="1">
-      <dialogheader id="header"/>
-      <iframe id="panelFrame" name="panelFrame" style="width: 0px" flex="1"/>
-   </vbox>
-  </hbox>
-
-   <script type="application/x-javascript">
-    <![CDATA[
-      if(window.arguments && window.arguments[0]) {
-        document.getElementById("panelFrame").setAttribute("src", window.arguments[0] );
-        document.getElementById("panelFrame").setAttribute("tag", window.arguments[0] );
-      }
-      else {
-        document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/content/pref/pref-navigator.xul" );
-        document.getElementById("panelFrame").setAttribute("tag", "chrome://communicator/content/pref/pref-navigator.xul" );
-      }
-    ]]>
-    </script>
-
-</dialog>
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -39,17 +39,16 @@
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://communicator/content/communicator.css"?>
 <?xml-stylesheet type="text/css" href="chrome://communicator/content/pref/prefpanels.css"?>
 <?xml-stylesheet type="text/css" href="chrome://mozapps/content/preferences/preferences.css"?>
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/prefpanels.css"?>
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/preferences.css"?>
 
 <!DOCTYPE prefwindow [
-  <!ENTITY % dtd1 SYSTEM "chrome://communicator/locale/pref/pref.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://communicator/locale/pref/preftree.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd" > %dtd3;
 ]>
 
 <prefwindow id="prefDialog" 
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&prefWindow.title;" 
             style="&prefWindow.size;"
@@ -73,17 +72,16 @@
     <treecols>
       <treecol id="categoryCol"
                label="&categoryHeader;"
                primary="true" 
                flex="1"/>
     </treecols>
 
     <treechildren id="prefsPanelChildren">
-      <treeitem label="READ THIS!" prefpane="temp_readthis_pane"/>
       <!-- Appearance items -->
       <treeitem container="true"
                 id="appearanceItem"
                 label="&appear.label;"
                 prefpane="appearance_pane"
                 helpTopic="appearance_pref"
                 url="chrome://communicator/content/pref/pref-appearance.xul">
         <treechildren id="appearanceChildren">
@@ -109,39 +107,43 @@
       <treeitem container="true"
                 id="navigator"
                 label="&navigator.label;"
                 prefpane="navigator_pane"
                 helpTopic="navigator_pref_navigator"
                 url="chrome://communicator/content/pref/pref-navigator.xul">
 
         <treechildren id="navigatorChildren">
-          <treeitem id="historyItem" label="&history.label;"
-                    prefpane="history_pane" helpTopic="navigator_pref_history"
+          <treeitem id="historyItem"
+                    label="&history.label;"
+                    prefpane="history_pane"
+                    helpTopic="navigator_pref_history"
                     url="chrome://communicator/content/pref/pref-history.xul"/>
           <treeitem id="languagesItem"
                     label="&languages.label;"
                     prefpane="languages_pane"
                     helpTopic="navigator_pref_languages"
                     url="chrome://communicator/content/pref/pref-languages.xul"/>
           <treeitem id="applicationsItem"
                     label="&applications.label;"
                     prefpane="applications_pane"
                     helpTopic="navigator_pref_helper_applications"
                     url="chrome://communicator/content/pref/pref-applications.xul"/>
           <treeitem id="locationBarItem"
                     label="&locationBar.label;"
                     prefpane="locationBar_pane"
                     helpTopic="navigator_pref_location_bar"
                     url="chrome://communicator/content/pref/pref-locationbar.xul"/>
-          <treeitem id="searchItem" label="&search.label;"
+          <treeitem id="searchItem"
+                    label="&search.label;"
                     prefpane="search_pane"
                     helpTopic="navigator_pref_internet_searching"
                     url="chrome://communicator/content/pref/pref-search.xul"/>
-          <treeitem id="tabsItem" label="&tabWindows.label;"
+          <treeitem id="tabsItem"
+                    label="&tabWindows.label;"
                     prefpane="tabs_pane"
                     helpTopic="navigator_pref_tabbed_browsing"
                     url="chrome://communicator/content/pref/pref-tabs.xul"/>
           <treeitem id="downloadItem"
                     label="&download.label;"
                     prefpane="download_pane"
                     helpTopic="navigator_pref_downloads"
                     url="chrome://communicator/content/pref/pref-download.xul"/>
@@ -204,72 +206,56 @@
       <!-- Advanced items -->
       <treeitem container="true"
                 id="advancedItem"
                 label="&advance.label;"
                 prefpane="advanced_pane"
                 helpTopic="advanced_pref_advanced"
                 url="chrome://communicator/content/pref/pref-advanced.xul">
         <treechildren id="advancedChildren">
-          <treeitem id="scriptsItem" label="&scriptsAndWindows.label;"
-                    prefpane="scripts_pane" helpTopic="advanced_pref_scripts"
+          <treeitem id="scriptsItem"
+                    label="&scriptsAndWindows.label;"
+                    prefpane="scripts_pane"
+                    helpTopic="advanced_pref_scripts"
                     url="chrome://communicator/content/pref/pref-scripts.xul"/>
-          <treeitem id="keynavItem" label="&keynav.label;"
-                    prefpane="keynav_pane" helpTopic="advanced_pref_keyboard_nav"
+          <treeitem id="keynavItem"
+                    label="&keynav.label;"
+                    prefpane="keynav_pane"
+                    helpTopic="advanced_pref_keyboard_nav"
                     url="chrome://communicator/content/pref/pref-keynav.xul"/>
           <treeitem id="cacheItem"
                     label="&cache.label;"
                     prefpane="cache_pane"
                     helpTopic="advanced_pref_cache"
                     url="chrome://communicator/content/pref/pref-cache.xul"/>
           <treeitem id="proxiesItem"
                     label="&proxies.label;"
                     prefpane="proxies_pane"
                     helpTopic="advanced_pref_proxies"
                     url="chrome://communicator/content/pref/pref-proxies.xul"/>
           <treeitem id="httpItem"
                     label="&httpnetworking.label;"
                     prefpane="http_pane"
                     helpTopic="advanced_http_networking"
                     url="chrome://communicator/content/pref/pref-http.xul"/>
-          <treeitem id="smartupdateItem" label="&smart.label;"
+          <treeitem id="smartupdateItem"
+                    label="&smart.label;"
                     prefpane="smartupdate_pane"
                     helpTopic="advanced_pref_installation"
                     url="chrome://communicator/content/pref/pref-smartupdate.xul"/>
-          <treeitem id="mousewheelItem" helpTopic="advanced_pref_mouse_wheel"
-                    prefpane="mousewheel_pane" label="&mousewheel.label;"
+          <treeitem id="mousewheelItem"
+                    label="&mousewheel.label;"
+                    prefpane="mousewheel_pane"
+                    helpTopic="advanced_pref_mouse_wheel"
                     url="chrome://communicator/content/pref/pref-mousewheel.xul"/>
         </treechildren>
       </treeitem>
 
       <!-- commented out until bug 82487 is fixed 
       <treeitem id="offlineItem"
                 label="&offline.label;"
+                helpTopic="mail_prefs_offline"
                 url="chrome://communicator/content/pref/pref-offline.xul"/>
       -->
     </treechildren>
   </tree>
 
-  <!-- the following script is only needed for the temporary prefpane below -->
-  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <prefpane id="temp_readthis_pane" label="Some Explanatory Words…">
-    <description>
-      The SeaMonkey preferences are being rewritten to use the same backend code
-      as other applications using the Mozilla XUL toolkit, e.g. Firefox or
-      Thunderbird. We have over 40 panels to migrate, which we'll do in small
-      chunks to guarantee we don't break anything. During this transition,
-      this dialog here will only contain those panels which have already been
-      migrated.
-    </description>
-    <description>
-      You can reach the old dialog via the menuitem Edit→(Legacy Prefwindow…)
-      in a browser window or by clicking the button below.
-    </description>
-    <description>
-      This panel will go away once all panels have been migrated.
-    </description>
-    <button label="Show old dialog with still unmigrated panels."
-            oncommand="goPreferences('navigator', 'chrome://communicator/content/pref/pref-navigator.xul', 'navigator');"/>
-    <label class="text-link" value="More information…"
-           onclick="openTopWin('https://bugzilla.mozilla.org/show_bug.cgi?id=394522', null);"/>
-  </prefpane>
-
 </prefwindow>
deleted file mode 100644
--- a/suite/common/pref/preftree.xul
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-1999
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-   Ben Goodger <ben@netscape.com>
-
- Alternatively, the contents of this file may be used under the terms of
- either of 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 ***** -->
-
-<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/preftree.dtd">
-
-<overlay id="prefTreeOverlay"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<script>
-<![CDATA[
-  var _elementIDs = []; // hack
-]]>
-</script>
-  
-<tree id="prefsTree" seltype="single" hidecolumnpicker="true"
-          onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
-  <treecols>
-    <treecol id="categoryCol" flex="1" primary="true" hideheader="true"/>
-  </treecols>
-  <treechildren id="panelChildren">
-    <treeitem container="true" id="appearance">
-      <treerow>   
-        <treecell label="(Migrated: &appear.label;)"/> 
-      </treerow>
-      <treechildren id="appearanceChildren">
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &fonts.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &colors.label;)"/> 
-          </treerow>
-        </treeitem>
-      </treechildren>
-    </treeitem>
-    <treeitem container="true" id="navigator">
-      <treerow>
-        <treecell label="(Migrated: &navigator.label;)"/> 
-      </treerow>
-      <treechildren id="navigatorChildren">
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &history.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &languages.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &applications.label;)"/> 
-          </treerow>  
-        </treeitem> 
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &locationBar.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &search.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="Migrated: &tabWindows.label;"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &download.label;)"/>
-          </treerow>
-        </treeitem>
-        <!-- Taking out Policies panel b/c bug 44121
-        <treeitem>
-          <treerow>
-            <treecell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
-          </treerow>
-        </treeitem> -->
-      </treechildren>
-    </treeitem>
-    
-    <!-- Security and Privacy items -->
-    <treeitem container="true" id="securityItem">
-      <treerow>
-        <treecell label="(Migrated: &security.label;)"/>
-      </treerow>
-      <treechildren id="securityChildren">
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &cookies.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &images.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem id="popupspref">
-          <treerow>
-            <treecell label="(Migrated: &popups.label;)"/> 
-          </treerow>
-        </treeitem>
-      </treechildren>
-    </treeitem>
-
-    <treeitem container="true" id="advancedItem">
-      <treerow>
-        <treecell label="(Migrated: &advance.label;)"/> 
-      </treerow>
-      <treechildren id="advancedChildren">
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &scriptsAndWindows.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &keynav.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &cache.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem id="proxiesItem">
-          <treerow>
-            <treecell label="(Migrated: &proxies.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &httpnetworking.label;)"/> 
-          </treerow>
-        </treeitem>        
-        <treeitem>
-          <treerow>
-            <treecell label="(Migrated: &smart.label;)"/>
-          </treerow>
-        </treeitem>
-        <treeitem id="mousewheelItem">
-          <treerow>
-            <treecell label="(Migrated: &mousewheel.label;)"/>
-          </treerow>  
-        </treeitem> 
-      </treechildren>
-    </treeitem>
-
-    <!-- commented out until bug 82487 is fixed -->
-    <!--
-    <treeitem id="offlineItem">
-      <treerow>
-        <treecell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/> 
-      </treerow>
-    </treeitem>
-    -->
-  </treechildren>
-</tree>
-
-</overlay>
--- a/suite/common/utilityOverlay.js
+++ b/suite/common/utilityOverlay.js
@@ -230,45 +230,30 @@ function getBrowserURL() {
     var url = prefs.getCharPref("browser.chromeURL");
     if (url)
       return url;
   } catch(e) {
   }
   return "chrome://navigator/content/navigator.xul";
 }
 
-function goPreferences(containerID, paneURL, itemID)
+function goPreferences(paneID)
 {
   //check for an existing pref window and focus it; it's not application modal
   const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
   const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
   const kWindowMediator = Components.classes[kWindowMediatorContractID]
                                     .getService(kWindowMediatorIID);
-
-  // Bug 394522:
-  // Until all our pref panels have been migrated to the toolkit way,
-  // we need to distinguish between old and new methods of opening a specific
-  // panel -> prefwindow only needs the prefpane id in window.arguments[0], so
-  // this function here only needs to get one param passed in the future
-  // -> we assume that a new style style pref panel is requested if only one
-  // (the first) parameter is passed.
-  var legacyPrefWindow = paneURL || itemID;
-  var prefWindowFragment = legacyPrefWindow ? "pref" : "preferences";
-  var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:" + prefWindowFragment);
+  var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:preferences");
   if (lastPrefWindow)
     lastPrefWindow.focus();
-  else {
-    if (!legacyPrefWindow) {
-      paneURL = containerID;
-      containerID = null;
-    }
-    openDialog("chrome://communicator/content/pref/" + prefWindowFragment + ".xul",
+  else
+    openDialog("chrome://communicator/content/pref/preferences.xul",
                "PrefWindow", "chrome,titlebar,dialog=no,resizable",
-               paneURL, containerID, itemID);
-  }
+               paneID);
 }
 
 function goToggleToolbar( id, elementID )
 {
   var toolbar = document.getElementById( id );
   var element = document.getElementById( elementID );
   if ( toolbar )
   {
--- a/suite/debugQA/content/debugQAPrefsOverlay.xul
+++ b/suite/debugQA/content/debugQAPrefsOverlay.xul
@@ -52,29 +52,9 @@
                   url="chrome://debugQA/content/pref-debug1.xul"/>
         <treeitem id="debugqa_debug2" label="&debug2.label;"
                   prefpane="debugqa_prefs_debug2"
                   url="chrome://debugQA/content/pref-debug2.xul"/>
       </treechildren>
     </treeitem>
   </treechildren>
 
-  <treechildren id="panelChildren">
-    <treeitem container="true" id="debugItem">
-      <treerow>       
-        <treecell label="Migrated: (&debug.label;)"/>
-      </treerow>
-      <treechildren>
-        <treeitem>
-          <treerow>
-            <treecell label="Migrated: (&debug1.label;)"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell label="Migrated: (&debug2.label;)"/> 
-          </treerow>
-        </treeitem>
-      </treechildren>
-    </treeitem>
-  </treechildren>
-
 </overlay>
--- a/suite/debugQA/jar.mn
+++ b/suite/debugQA/jar.mn
@@ -1,14 +1,13 @@
 debugqa.jar:
 % content debugqa %content/debugqa/ xpcnativewrappers=yes
 % overlay chrome://navigator/content/navigatorOverlay.xul chrome://debugqa/content/debugQAMenuOverlay.xul
 % overlay chrome://editor/content/editor.xul chrome://debugqa/content/debugQAEditorOverlay.xul
 % overlay chrome://navigator/content/navigator.xul chrome://debugqa/content/debugQANavigatorOverlay.xul
-% overlay chrome://communicator/content/pref/preftree.xul chrome://debugqa/content/debugQAPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/preferences.xul chrome://debugqa/content/debugQAPrefsOverlay.xul
   content/debugqa/debugQAEditorOverlay.js                 (content/debugQAEditorOverlay.js)
   content/debugqa/debugQAEditorOverlay.xul                (content/debugQAEditorOverlay.xul)
   content/debugqa/debugQAMenuOverlay.js                   (content/debugQAMenuOverlay.js)
   content/debugqa/debugQAMenuOverlay.xul                  (content/debugQAMenuOverlay.xul)
   content/debugqa/debugQANavigatorOverlay.xul             (content/debugQANavigatorOverlay.xul)
   content/debugqa/debugQAPrefsOverlay.xul                 (content/debugQAPrefsOverlay.xul)
   content/debugqa/debugQATextEditorShell.xul              (content/debugQATextEditorShell.xul)
deleted file mode 100644
--- a/suite/locales/en-US/chrome/common/pref/PrefsOverlay.dtd
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- ***** 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
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Bob Lord <lord@netscape.com>
-   -   Terry Hayes <thayes@netscape.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 ***** -->
-
-<!ENTITY  masterpass.label             "Master Passwords">
-<!ENTITY  security.label               "Privacy and Security">
-<!ENTITY  ssl.label                    "SSL">
-<!ENTITY  certs.label                  "Certificates">
-<!ENTITY  validation.label             "Validation">
deleted file mode 100644
--- a/suite/locales/en-US/chrome/common/pref/pref.dtd
+++ /dev/null
@@ -1,3 +0,0 @@
-<!ENTITY  prefWindow.title            "Preferences">
-<!ENTITY  categoryHeader              "Category">
-
--- a/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preftree.dtd
@@ -1,11 +1,11 @@
-<!-- extracted from content/preftree.xul -->
-
 <!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
+<!ENTITY prefWindow.title "Preferences">
+<!ENTITY categoryHeader "Category">
 <!ENTITY appear.label "Appearance">
 <!ENTITY content.label "Content">
 <!ENTITY fonts.label "Fonts">
 <!ENTITY colors.label "Colors">
 <!ENTITY navigator.label "Browser">
 <!ENTITY history.label "History">
 <!ENTITY bidi.label "Bidi Options">
 <!ENTITY languages.label "Languages">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -127,17 +127,16 @@
   locale/@AB_CD@/communicator/migration/migration.dtd                       (%chrome/common/migration/migration.dtd)
   locale/@AB_CD@/communicator/migration/migration.properties                (%chrome/common/migration/migration.properties)
   locale/@AB_CD@/communicator/overrides/netErrorApp.dtd                     (%chrome/common/overrides/netErrorApp.dtd)
   locale/@AB_CD@/communicator/permissions/cookieViewer.properties           (%chrome/common/permissions/cookieViewer.properties)
   locale/@AB_CD@/communicator/permissions/cookieViewer.dtd                  (%chrome/common/permissions/cookieViewer.dtd)
   locale/@AB_CD@/communicator/permissions/permissionsManager.dtd            (%chrome/common/permissions/permissionsManager.dtd)
   locale/@AB_CD@/communicator/permissions/permissionsManager.properties     (%chrome/common/permissions/permissionsManager.properties)
   locale/@AB_CD@/communicator/permissions/permissionsNavigatorOverlay.dtd   (%chrome/common/permissions/permissionsNavigatorOverlay.dtd)
-  locale/@AB_CD@/communicator/pref/pref.dtd                                 (%chrome/common/pref/pref.dtd)
   locale/@AB_CD@/communicator/pref/prefutilities.properties                 (%chrome/common/pref/prefutilities.properties)
   locale/@AB_CD@/communicator/pref/preftree.dtd                             (%chrome/common/pref/preftree.dtd)
   locale/@AB_CD@/communicator/pref/pref-advanced.dtd                        (%chrome/common/pref/pref-advanced.dtd)
   locale/@AB_CD@/communicator/pref/pref-appearance.dtd                      (%chrome/common/pref/pref-appearance.dtd)
   locale/@AB_CD@/communicator/pref/pref-applications.dtd                    (%chrome/common/pref/pref-applications.dtd)
   locale/@AB_CD@/communicator/pref/pref-applications.properties             (%chrome/common/pref/pref-applications.properties)
   locale/@AB_CD@/communicator/pref/pref-applicationManager.dtd              (%chrome/common/pref/pref-applicationManager.dtd)
   locale/@AB_CD@/communicator/pref/pref-applicationManager.properties       (%chrome/common/pref/pref-applicationManager.properties)
@@ -334,9 +333,8 @@
   locale/@AB_CD@/navigator-platform/unix/platformNavigationBindings.dtd     (%chrome/browser/unix/platformNavigationBindings.dtd)
   locale/@AB_CD@/navigator-platform/win/navigator.properties                (%chrome/browser/win/navigator.properties)
   locale/@AB_CD@/navigator-platform/win/platformNavigationBindings.dtd      (%chrome/browser/win/platformNavigationBindings.dtd)
   locale/@AB_CD@/navigator-region/region.properties                         (%chrome/browser/region.properties)
   locale/@AB_CD@/pippki/pref-certs.dtd                                      (%chrome/common/pref/pref-certs.dtd)
   locale/@AB_CD@/pippki/pref-masterpass.dtd                                 (%chrome/common/pref/pref-masterpass.dtd)
   locale/@AB_CD@/pippki/pref-ssl.dtd                                        (%chrome/common/pref/pref-ssl.dtd)
   locale/@AB_CD@/pippki/pref-validation.dtd                                 (%chrome/common/pref/pref-validation.dtd)
-  locale/@AB_CD@/pippki/PrefsOverlay.dtd                                    (%chrome/common/pref/PrefsOverlay.dtd)
--- a/suite/security/jar.mn
+++ b/suite/security/jar.mn
@@ -1,10 +1,8 @@
 pippki.jar:
-% overlay chrome://communicator/content/pref/preftree.xul chrome://pippki/content/PrefOverlay.xul
-   content/pippki/PrefOverlay.xul           (prefs/PrefOverlay.xul)
    content/pippki/pref-certs.js             (prefs/pref-certs.js)
    content/pippki/pref-certs.xul            (prefs/pref-certs.xul)
    content/pippki/pref-masterpass.js        (prefs/pref-masterpass.js)
    content/pippki/pref-masterpass.xul       (prefs/pref-masterpass.xul)
    content/pippki/pref-ssl.xul              (prefs/pref-ssl.xul)
    content/pippki/pref-validation.js        (prefs/pref-validation.js)
    content/pippki/pref-validation.xul       (prefs/pref-validation.xul)
deleted file mode 100644
--- a/suite/security/prefs/PrefOverlay.xul
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** 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
-   - Netscape Communications Corp.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Terry Hayes <thayes@netscape.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 ***** -->
-
-<!DOCTYPE overlay SYSTEM "chrome://pippki/locale/PrefsOverlay.dtd">
-
-<overlay id="pipPrefOverlayID"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <treechildren id="securityChildren">
-    <treeitem id="masterpassItem">
-      <treerow>
-        <treecell label="(Migrated: &masterpass.label;)"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="sslItem">
-      <treerow>
-        <treecell label="(Migrated: &ssl.label;)"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="certItem">
-      <treerow>
-        <treecell label="(Migrated: &certs.label;)"/>
-      </treerow>
-    </treeitem>
-    <treeitem id="validationItem">
-      <treerow>
-        <treecell label="(Migrated: &validation.label;)"/>
-      </treerow>
-    </treeitem>
-  </treechildren>
-</overlay>