Bug 691662 - Remove unnecessary condition which doesn't work with Growl 1.3. r=sdwilsh
authorMarkus Stange <mstange@themasta.com>
Sun, 13 Nov 2011 09:03:23 +0100
changeset 80996 ee9ab83779a908310578c9906e3ab22773585b56
parent 80995 4eb3558c97ada411f9a6e9750d02868c56c1d503
child 80997 d2380072ab02c4043e37b73e87f29ec7f4aa8257
push idunknown
push userunknown
push dateunknown
reviewerssdwilsh
bugs691662
milestone11.0a1
Bug 691662 - Remove unnecessary condition which doesn't work with Growl 1.3. r=sdwilsh
toolkit/components/alerts/mac/nsAlertsService.mm
--- a/toolkit/components/alerts/mac/nsAlertsService.mm
+++ b/toolkit/components/alerts/mac/nsAlertsService.mm
@@ -87,18 +87,17 @@ DispatchNamedNotification(const nsAStrin
                           const nsAString &aImage,
                           const nsAString &aTitle,
                           const nsAString &aMessage,
                           const nsAString &aCookie,
                           nsIObserver *aListener)
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  if ([GrowlApplicationBridge isGrowlInstalled] == NO ||
-      [GrowlApplicationBridge isGrowlRunning] == NO)
+  if ([GrowlApplicationBridge isGrowlRunning] == NO)
     return NS_ERROR_NOT_AVAILABLE;
 
   mozGrowlDelegate *delegate =
     static_cast<mozGrowlDelegate *>([GrowlApplicationBridge growlDelegate]);
   if (!delegate)
     return NS_ERROR_NOT_AVAILABLE;
 
   PRUint32 ind = 0;
@@ -141,19 +140,16 @@ NS_INTERFACE_MAP_BEGIN(nsAlertsService)
   NS_INTERFACE_MAP_ENTRY(nsIAlertsService)
 NS_INTERFACE_MAP_END_THREADSAFE
 
 nsresult
 nsAlertsService::Init()
 {
   NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
 
-  if ([GrowlApplicationBridge isGrowlInstalled] == NO)
-    return NS_ERROR_SERVICE_NOT_AVAILABLE;
-
   NS_ASSERTION([GrowlApplicationBridge growlDelegate] == nil,
                "We already registered with Growl!");
 
   nsresult rv;
   nsCOMPtr<nsIObserverService> os =
     do_GetService("@mozilla.org/observer-service;1", &rv);
   NS_ENSURE_SUCCESS(rv, rv);