From 69a490296308d3b0b6a2a6430bfb87ce0e0c1903 Mon Sep 17 00:00:00 2001
From: "bsmedberg%covad.net"
 <bsmedberg%covad.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 17 Jan 2004 20:04:03 +0000
Subject: [PATCH] Bug 231270 - fix default prefs for Mac OSX rs=dbaron

git-svn-id: svn://10.0.0.236/trunk@151458 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/ui/composer.js           |  3 ++-
 mozilla/mailnews/mailnews.js            | 16 +++++-----------
 mozilla/modules/libpref/src/init/all.js | 22 +++++++++-------------
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/mozilla/editor/ui/composer.js b/mozilla/editor/ui/composer.js
index b763a6afc23..0481ec4ebe0 100644
--- a/mozilla/editor/ui/composer.js
+++ b/mozilla/editor/ui/composer.js
@@ -128,8 +128,9 @@ pref("editor.always_show_publish_dialog",    false);
  */
 //pref("editor.encode_entity",                 "html");
 
+#ifndef XP_MACOSX
 #ifdef XP_UNIX
 pref("editor.disable_spell_checker", false);
 pref("editor.dont_lock_spell_files", true);
 #endif
-
+#endif
diff --git a/mozilla/mailnews/mailnews.js b/mozilla/mailnews/mailnews.js
index ee34beaf5a0..8f0df68d7af 100644
--- a/mozilla/mailnews/mailnews.js
+++ b/mozilla/mailnews/mailnews.js
@@ -559,21 +559,13 @@ pref("mail.standalone", false);
 
 pref("mailnews.view.last",0); // 0 == "all" view
 
-#if OS_ARCH==WINNT
+#ifdef XP_WIN
 // Unread mail count timer. Value to be specified in seconds
 // default is 5 minutes, i.e., 5 * 60 seconds = 300
 pref("mail.windows_xp_integration.unread_count_interval", 300);
 #endif
 
-#if MOZ_WIDGET_TOOLKIT==cocoa
-#define MAC_PREFS 1
-#else
-#if MOZ_WIDGET_TOOLKIT==mac
-#define MAC_PREFS 1
-#endif
-#endif
-
-#ifdef MAC_PREFS
+#ifdef XP_MACOSX
 pref("mail.notification.sound",             "");
 pref("mail.close_message_window.on_delete", true);
 pref("mail.close_message_window.on_file", true);
@@ -581,6 +573,7 @@ pref("mail.close_message_window.on_file", true);
 pref("mail.server_type_on_restart",         -1);
 #endif
 
+#ifndef XP_MACOSX
 #ifdef XP_UNIX
 pref("mail.empty_trash", false);
 
@@ -600,5 +593,6 @@ pref("mail.signature_date", 0);
 
 // until bug #130581 is fixed, we need to override this on linux
 pref("mail.compose.max_recycled_windows", 0);
+# XP_UNIX
+#endif
 #endif
-
diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js
index 509343eff80..f2b5fc5f1f1 100644
--- a/mozilla/modules/libpref/src/init/all.js
+++ b/mozilla/modules/libpref/src/init/all.js
@@ -795,7 +795,7 @@ pref("config.use_system_prefs.accessibility", false);
 pref("editor.resizing.preserve_ratio",       true);
 pref("editor.positioning.offset",            0);
 
-#if OS_ARCH==WINNT
+#ifdef XP_WIN
 pref("font.name.serif.ar", "Times New Roman");
 pref("font.name.sans-serif.ar", "Arial");
 pref("font.name.monospace.ar", "Courier New");
@@ -1011,15 +1011,7 @@ pref("intl.jis0208.map", "CP932");
 # WINNT
 #endif
 
-#if MOZ_WIDGET_TOOLKIT==cocoa
-#define MAC_PREFS 1
-#else
-#if MOZ_WIDGET_TOOLKIT==mac
-#define MAC_PREFS 1
-#endif
-#endif
-
-#ifdef MAC_PREFS
+#ifdef XP_MACOSX
 // Mac specific preference defaults
 pref("browser.drag_out_of_frame_style", 1);
 pref("ui.key.saveLink.shift", false); // true = shift, false = meta
@@ -1194,10 +1186,10 @@ pref("print.print_extra_margin", 90); // twips (90 twips is an eigth of an inch)
 // This indicates whether it should use the native dialog or the XP Dialog
 pref("print.use_native_print_dialog", true);
 
-# MAC_PREFS
+# XP_MACOSX
 #endif
 
-#if MOZ_WIDGET_TOOLKIT==os2
+#if XP_OS2
 
 pref("ui.key.menuAccessKeyFocuses", true);
 pref("browser.display.screen_resolution", 0); // System setting
@@ -1360,7 +1352,7 @@ pref("intl.jis0208.map", "IBM943");
 # OS2
 #endif
 
-#if MOZ_WIDGET_TOOLKIT==beos
+#if XP_BEOS
 
 pref("intl.font_charset", "");
 pref("intl.font_spec_list", "");
@@ -1483,6 +1475,7 @@ pref("print.print_extra_margin", 90); // twips (90 twips is an eigth of an inch)
 # photon
 #endif
 
+#ifndef XP_MACOSX
 #ifdef XP_UNIX
 // Handled differently under Mac/Windows
 pref("network.hosts.smtp_server", "localhost");
@@ -1819,6 +1812,9 @@ pref("print.postscript.nativefont.x-western",      "");
 pref("print.postscript.nativefont.zh-CN",          "");
 pref("print.postscript.nativefont.zh-TW",          "");
 pref("print.postscript.nativefont.zh-HK",          "");
+
+# XP_UNIX
+#endif
 #endif
 
 #if OS_ARCH==OpenVMS