From eb3c0ad1ef1cfdd705262979701dccdfd8409502 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Thu, 1 Jul 2004 06:51:16 +0000
Subject: [PATCH] Back out an accidental checkin

---
 .../prefwindow/content/pref-mailnews.xul       | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/mail/components/prefwindow/content/pref-mailnews.xul b/mail/components/prefwindow/content/pref-mailnews.xul
index 16691c90dedc..94856f862194 100644
--- a/mail/components/prefwindow/content/pref-mailnews.xul
+++ b/mail/components/prefwindow/content/pref-mailnews.xul
@@ -42,32 +42,20 @@
     var _elementIDs = ["mailnewsStartPageEnabled", "mailnewsStartPageUrl", "mailPaneConfig", "mailnewsDoubleClick2NewWindow", "mailRememberLastMsg",
                        "mailnewsSoundFileUrl", "newMailNotification", "newMailNotificationType",
                        "newMailNotificationAlert"];
-#ifdef XP_WIN
-    _elementIDs.push("mailnewsEnableMapi");
-    _elementIDs.push("mailnewsEnableNews");
-#endif
-
   ]]>
   </script>
   
   <groupbox align="start">
     <caption label="&generalSettings.label;"/>
     
-#ifdef XP_WIN
-      <checkbox id="mailnewsEnableMapi" label="&setDefaultMailClient.label;"
-              accesskey="&setDefaultMailClient.accesskey;" 
-              oncommand="onEnableMapi();"
-              startupFunc="registerCallback();"/>
+    <hbox id="mapi"/>
 
-      <checkbox id="mailnewsEnableNews" label="&setDefaultNewsClient.label;"
-              accesskey="&setDefaultNewsClient.accesskey;" 
-              oncommand="onEnableNews();"/>
-#endif
-    <separator class="thin"/>
     <checkbox id="mailRememberLastMsg" label="&rememberLastMsg.label;"
               prefstring="mailnews.remember_selected_message"
               accesskey="&rememberLastMsg.accesskey;"/>
 
+    <separator class="thin"/>
+    
   </groupbox>
   
   <hbox>