From 2fe1a00bab191abbe65fcc764e553f42fce78620 Mon Sep 17 00:00:00 2001
From: "srilatha%netscape.com" <srilatha%netscape.com>
Date: Tue, 18 Sep 2001 22:26:16 +0000
Subject: [PATCH] Fix for bug #95122. sr=sspitzer Cleaning up the contents.rdf
 and fixing the js error

---
 mailnews/mapi/resources/content/contents.rdf  | 12 ----------
 .../resources/content/pref-mailnewsOverlay.js | 24 ++++++++++++-------
 modules/libpref/src/win/winpref.js            |  2 ++
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/mailnews/mapi/resources/content/contents.rdf b/mailnews/mapi/resources/content/contents.rdf
index 60b349e5675..ef4cfe32ea3 100644
--- a/mailnews/mapi/resources/content/contents.rdf
+++ b/mailnews/mapi/resources/content/contents.rdf
@@ -33,8 +33,6 @@
     <RDF:li resource="chrome://messenger/content/addressbook/abSelectAddressesDialog.xul"/>
     <RDF:li resource="chrome://editor/content/editor.xul"/>
     <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
-    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
   </RDF:Seq>
 
 
@@ -112,14 +110,4 @@
     <RDF:li>chrome://messenger/content/pref-mailnewsOverlay.xul</RDF:li>
   </RDF:Seq>
 
-  <!-- mail Integration dialog -->
-  <RDF:Seq about="chrome://messenger/content/messenger.xul">
-    <RDF:li>chrome://messenger/content/mailIntegrationOverlay.xul</RDF:li>
-  </RDF:Seq>
- 
-  <!-- mail Integration dialog --> 
-  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
-    <RDF:li>chrome://messenger/content/mailIntegrationOverlay.xul</RDF:li>
-  </RDF:Seq>
-
 </RDF:RDF>
diff --git a/mailnews/mapi/resources/content/pref-mailnewsOverlay.js b/mailnews/mapi/resources/content/pref-mailnewsOverlay.js
index 7da6b922e28..1d647ee5193 100644
--- a/mailnews/mapi/resources/content/pref-mailnewsOverlay.js
+++ b/mailnews/mapi/resources/content/pref-mailnewsOverlay.js
@@ -21,15 +21,16 @@
  */
 
 parent.hPrefWindow.registerOKCallbackFunc( onOK );
-try {
-    var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
-                   getService( Components.interfaces.nsIMapiRegistry );
-}
-catch(ex){
-    mapiRegistry = null;
-}
 
 function mailnewsOverlayInit() {
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    }
+
     const prefbase = "system.windows.lock_ui.";
     var mailnewsEnableMapi = document.getElementById("mailnewsEnableMapi");
     if (mapiRegistry) {
@@ -60,7 +61,14 @@ function mailnewsOverlayInit() {
 }
 
 function onOK()
-{ 
+{
+    try {
+        var mapiRegistry = Components.classes[ "@mozilla.org/mapiregistry;1" ].
+                   getService( Components.interfaces.nsIMapiRegistry );
+    }
+    catch(ex){
+        mapiRegistry = null;
+    } 
     if (mapiRegistry) { 
         if (document.getElementById("mailnewsEnableMapi").checked)
             mapiRegistry.setDefaultMailClient();
diff --git a/modules/libpref/src/win/winpref.js b/modules/libpref/src/win/winpref.js
index d757682a9bd..436bcb30f92 100644
--- a/modules/libpref/src/win/winpref.js
+++ b/modules/libpref/src/win/winpref.js
@@ -156,6 +156,8 @@ pref("font.size.fixed.zh-TW", 16);
 
 pref("font.size.nav4rounding", false);
 
+pref("system.windows.lock_ui.default_mail_client", false);
+
 pref("netinst.profile.show_profile_wizard", true); 
 
 //The following pref is internal to Communicator. Please