Bug 1290324 - Remove notifications.xul, notifications.dtd, newmailalert.* and alerts.totalOpenTime preference on OS X. r=paenglab,mkmelin,philip.chee a=philip.chee

--HG--
extra : rebase_source : 7e56880ec4dbe60bd5db0cfc25c67737f95c2335

mail/app/profile/all-thunderbird.js

@@ -440,7 +440,9 @@ pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.org/%LOCA
 pref("profile.force.migration", "");
 
 // prefs to control the mail alert notification
+#ifndef XP_MACOSX
 pref("alerts.totalOpenTime", 10000);
+#endif
 
 // analyze urls in mail messages for scams
 pref("mail.phishing.detection.enabled", true);

mail/components/preferences/jar.mn

@@ -45,7 +45,9 @@ messenger.jar:
     content/messenger/preferences/actionsshared.js
     content/messenger/preferences/fonts.js
 *   content/messenger/preferences/fonts.xul
+#ifndef XP_MACOSX
     content/messenger/preferences/notifications.xul
+#endif
     content/messenger/preferences/offline.js
     content/messenger/preferences/offline.xul
     content/messenger/preferences/cookies.js

mail/locales/jar.mn

@@ -172,7 +172,9 @@
   locale/@AB_CD@/messenger/preferences/applicationManager.properties    (%chrome/messenger/preferences/applicationManager.properties)
   locale/@AB_CD@/messenger/preferences/fonts.dtd                        (%chrome/messenger/preferences/fonts.dtd)
   locale/@AB_CD@/messenger/preferences/offline.dtd                      (%chrome/messenger/preferences/offline.dtd)
+#ifndef XP_MACOSX
   locale/@AB_CD@/messenger/preferences/notifications.dtd                (%chrome/messenger/preferences/notifications.dtd)
+#endif
   locale/@AB_CD@/messenger/preferences/preferences.properties           (%chrome/messenger/preferences/preferences.properties)
   locale/@AB_CD@/messenger/preferences/cookies.dtd                      (%chrome/messenger/preferences/cookies.dtd)
   locale/@AB_CD@/messenger/preferences/permissions.dtd                  (%chrome/messenger/preferences/permissions.dtd)

mailnews/jar.mn

@@ -131,6 +131,8 @@ messenger.jar:
     content/messenger/dateFormat.js                                            (base/content/dateFormat.js)
     content/messenger/shutdownWindow.xul                                       (base/content/shutdownWindow.xul)
     content/messenger/shutdownWindow.js                                        (base/content/shutdownWindow.js)
+#ifndef XP_MACOSX
     content/messenger/newmailalert.css                                         (base/content/newmailalert.css)
     content/messenger/newmailalert.js                                          (base/content/newmailalert.js)
     content/messenger/newmailalert.xul                                         (base/content/newmailalert.xul)
+#endif