Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.

This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.

1 files changed, 0 insertions, 22 deletions

diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
index 49ac33827e..ae172305d2 100644
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -696,11 +696,7 @@ pref("mail.biff.alert.show_subject", true);
 pref("mail.biff.alert.show_sender",  true);
 pref("mail.biff.alert.preview_length", 40);
 
-#ifdef XP_MACOSX
-pref("mail.biff.play_sound", false);
-#else
 pref("mail.biff.play_sound", true);
-#endif
 // 0 == default system sound, 1 == user specified wav
 pref("mail.biff.play_sound.type", 0);
 // _moz_mailbeep is a magic key, for the default sound.
@@ -710,8 +706,6 @@ pref("mail.biff.show_alert", true);
 #ifdef XP_WIN
 pref("mail.biff.show_tray_icon", true);
 pref("mail.biff.show_balloon", false);
-#elifdef XP_MACOSX
-pref("mail.biff.animate_dock_icon", false);
 #elifdef XP_UNIX
 pref("mail.biff.use_system_alert", false);
 #endif
@@ -724,13 +718,6 @@ pref("mail.biff.add_interval_jitter", true);
 pref("mail.biff.on_new_window", true);
 #endif
 
-#ifdef XP_MACOSX
-// If true, the number used in the Mac OS X dock notification will be the
-// the number of "new" messages, as per the classic Thunderbird definition.
-// Defaults to false, which notifies about the number of unread messages.
-pref("mail.biff.use_new_count_in_mac_dock", false);
-#endif
-
 // For feed account serverType=rss sound on biff; if true, mail.biff.play_sound.* settings are used.
 pref("mail.feed.play_sound", false);
 
@@ -847,15 +834,6 @@ pref("ldap_2.servers.oe.description", "chrome://messenger/locale/addressbook/add
 pref("ldap_2.servers.oe.dirType", 3);
 #endif
 #endif
-#ifdef XP_MACOSX
-pref("ldap_2.servers.osx.uri", "moz-abosxdirectory:///");
-pref("ldap_2.servers.osx.description", "chrome://messenger/locale/addressbook/addressBook.properties");
-pref("ldap_2.servers.osx.dirType", 3);
-pref("mail.notification.sound",             "");
-pref("mail.notification.count.inbox_only", true);
-// Work around bug 482811 by disabling slow script warning for chrome scripts on Mac
-pref("dom.max_chrome_script_run_time", 0);
-#endif
 
 // gtk2 (*nix) lacks transparent/translucent drag support (bug 376238), so we
 // want to disable it so people can see where they are dragging things.