Port bug 904298's changes to nsIAlertService to comm-central, rs=bustage-fix to help reopen CLOSED TREE
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 12 Nov 2013 14:09:59 -0600
changeset 16890 40c8cff67dc6f45d35a417f052c52fece0455362
parent 16889 ea20d61fe85beb57fff49a30f6f42496154f9ba2
child 16891 1f9de62b2409405e87fd6616cfd7c3cb8730d42f
push id1074
push userbugzilla@standard8.plus.com
push dateMon, 03 Feb 2014 22:47:23 +0000
treeherdercomm-beta@6b791b5369ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs904298
Port bug 904298's changes to nsIAlertService to comm-central, rs=bustage-fix to help reopen CLOSED TREE
mailnews/base/src/nsMessengerOSXIntegration.mm
mailnews/base/src/nsMessengerUnixIntegration.cpp
mailnews/base/src/nsMessengerWinIntegration.cpp
--- a/mailnews/base/src/nsMessengerOSXIntegration.mm
+++ b/mailnews/base/src/nsMessengerOSXIntegration.mm
@@ -394,17 +394,17 @@ nsMessengerOSXIntegration::ShowAlertMess
     // If we have an nsIAlertsService implementation, use it:
     if (NS_SUCCEEDED(rv))
     {
       alertsService->ShowAlertNotification(NS_LITERAL_STRING(kNewMailAlertIcon),
                                            aAlertTitle, aAlertText, true,
                                            NS_ConvertASCIItoUTF16(aFolderURI),
                                            this, EmptyString(),
                                            NS_LITERAL_STRING("auto"),
-                                           EmptyString());
+                                           EmptyString(), nullptr);
     }
 
     BounceDockIcon();
   }
 
   if (!showAlert || NS_FAILED(rv))
     OnAlertFinished();
 
--- a/mailnews/base/src/nsMessengerUnixIntegration.cpp
+++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp
@@ -354,17 +354,18 @@ nsresult nsMessengerUnixIntegration::Sho
       rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON),
                                                 aAlertTitle,
                                                 aAlertText,
                                                 false,
                                                 NS_ConvertASCIItoUTF16(aFolderURI),
                                                 this,
                                                 EmptyString(),
                                                 NS_LITERAL_STRING("auto"),
-                                                EmptyString());
+                                                EmptyString(),
+                                                nullptr);
       if (NS_SUCCEEDED(rv))
         return rv;
     }
     AlertFinished();
     rv = ShowNewAlertNotification(false);
 
   }
 
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -443,17 +443,17 @@ nsresult nsMessengerWinIntegration::Show
     nsCOMPtr<nsIAlertsService> alertsService (do_GetService(NS_ALERTSERVICE_CONTRACTID, &rv));
     if (NS_SUCCEEDED(rv))
     {
       rv = alertsService->ShowAlertNotification(NS_LITERAL_STRING(NEW_MAIL_ALERT_ICON), aAlertTitle,
                                                 aAlertText, true,
                                                 NS_ConvertASCIItoUTF16(aFolderURI), this,
                                                 EmptyString(),
                                                 NS_LITERAL_STRING("auto"),
-                                                EmptyString());
+                                                EmptyString(), nullptr);
       mAlertInProgress = true;
     }
   }
 
   if (!showAlert || NS_FAILED(rv)) // go straight to showing the system tray icon.
     AlertFinished();
 
   return rv;