Bug 1165320 - Followup fix for Windows and Mac OSX where mail.biff.use_system_alert doesn't exist. r=mkmelin, a=rkent THUNDERBIRD_38_VERBRANCH THUNDERBIRD_38_0b6_BUILD1
authorrsx11m <rsx11m.pub@gmail.com>
Sat, 16 May 2015 10:25:32 -0500
branchTHUNDERBIRD_38_VERBRANCH
changeset 22351 841b6674044b7b55818a03caeee67a017378a7db
parent 22348 cfca7dcba68a7457e5e8f86b91d7f2a5d645cf8a
child 22353 46fcd4637f4b01043fd1a08abc38ca8d1d11a44f
push id1402
push userkent@caspia.com
push dateTue, 19 May 2015 18:53:03 +0000
treeherdercomm-beta@841b6674044b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, rkent
bugs1165320
Bug 1165320 - Followup fix for Windows and Mac OSX where mail.biff.use_system_alert doesn't exist. r=mkmelin, a=rkent
mail/test/mozmill/notification/test-notification.js
--- a/mail/test/mozmill/notification/test-notification.js
+++ b/mail/test/mozmill/notification/test-notification.js
@@ -99,17 +99,20 @@ function setupModule(module) {
                              "Mock Alerts Service",
                              "@mozilla.org/system-alerts-service;1",
                              gMockAlertsServiceFactory);
 
   // Ensure we have enabled new mail notifications
   remember_and_set_bool_pref("mail.biff.show_alert", true);
 
   // Ensure that system notifications are used (relevant for Linux only)
-  remember_and_set_bool_pref("mail.biff.use_system_alert", true);
+  if (Services.appinfo.OS == "Linux" ||
+      ("@mozilla.org/gio-service;1" in Components.classes) ||
+      ("@mozilla.org/gnome-gconf-service;1" in Components.classes))
+    remember_and_set_bool_pref("mail.biff.use_system_alert", true);
 
   MailServices.accounts.localFoldersServer.performingBiff = true;
 
   // Create a second identity to check cross-account
   // notifications.
   var identity2 = MailServices.accounts.createIdentity();
   identity2.email = "new-account@foo.invalid";