Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=506470, Mac alerts service should not initialize Growl on app startup; r=sdwilsh

Browse Source
This commit is contained in:
Vladimir Vukicevic 2009-08-20 12:55:21 -07:00
parent 58486359e8
commit a57b68f667
2 changed files with 20 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
toolkit/components/alerts/src/mac/nsAlertsService.mm
View File

@ -149,13 +149,26 @@ nsAlertsService::Init()
if ([GrowlApplicationBridge isGrowlInstalled] == NO) if ([GrowlApplicationBridge isGrowlInstalled] == NO)
return NS_ERROR_SERVICE_NOT_AVAILABLE; return NS_ERROR_SERVICE_NOT_AVAILABLE;
NS_ASSERTION([GrowlApplicationBridge growlDelegate] == nil,
"We already registered with Growl!");
nsresult rv; nsresult rv;
nsCOMPtr<nsIObserverService> os = nsCOMPtr<nsIObserverService> os =
do_GetService("@mozilla.org/observer-service;1", &rv); do_GetService("@mozilla.org/observer-service;1", &rv);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
rv = os->AddObserver(this, "final-ui-startup", PR_FALSE); nsRefPtr<nsNotificationsList> notifications = new nsNotificationsList();
NS_ENSURE_SUCCESS(rv, rv);
if (notifications)
(void)os->NotifyObservers(notifications, "before-growl-registration", nsnull);
mDelegate = new GrowlDelegateWrapper();
if (notifications)
notifications->informController(mDelegate->delegate);
// registers with Growl
[GrowlApplicationBridge setGrowlDelegate: mDelegate->delegate];
(void)os->AddObserver(this, DOM_WINDOW_DESTROYED_TOPIC, PR_FALSE); (void)os->AddObserver(this, DOM_WINDOW_DESTROYED_TOPIC, PR_FALSE);
(void)os->AddObserver(this, "profile-before-change", PR_FALSE); (void)os->AddObserver(this, "profile-before-change", PR_FALSE);
@ -227,32 +240,15 @@ nsAlertsService::Observe(nsISupports* aSubject, const char* aTopic,
{ {
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT; NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
if (strcmp(aTopic, "final-ui-startup") == 0) { if (!mDelegate)
NS_ASSERTION([GrowlApplicationBridge growlDelegate] == nil, return NS_OK;
"We already registered with Growl!");
nsRefPtr<nsNotificationsList> notifications = new nsNotificationsList(); if (strcmp(aTopic, DOM_WINDOW_DESTROYED_TOPIC) == 0) {
if (notifications) {
nsCOMPtr<nsIObserverService> os =
do_GetService("@mozilla.org/observer-service;1");
(void)os->NotifyObservers(notifications, "before-growl-registration", nsnull);
}
mDelegate = new GrowlDelegateWrapper();
if (notifications)
notifications->informController(mDelegate->delegate);
// registers with Growl
[GrowlApplicationBridge setGrowlDelegate: mDelegate->delegate];
}
else if (strcmp(aTopic, DOM_WINDOW_DESTROYED_TOPIC) == 0 && mDelegate) {
nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(aSubject)); nsCOMPtr<nsIDOMWindow> window(do_QueryInterface(aSubject));
if (window) if (window)
[mDelegate->delegate forgetObserversForWindow:window]; [mDelegate->delegate forgetObserversForWindow:window];
} }
else if (strcmp(aTopic, "profile-before-change") == 0 && mDelegate) { else if (strcmp(aTopic, "profile-before-change") == 0) {
[mDelegate->delegate forgetObservers]; [mDelegate->delegate forgetObservers];
} }

46
toolkit/components/alerts/src/mac/nsAlertsServiceModule.cpp
View File

@ -45,56 +45,12 @@
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsAlertsService, Init)
static
NS_METHOD
nsAlertsServiceRegister(nsIComponentManager* aCompMgr,
nsIFile* aPath,
const char* registryLocation,
const char* componentType,
const nsModuleComponentInfo* info)
{
nsresult rv;
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
char* prev = nsnull;
rv = catman->AddCategoryEntry("app-startup", "nsAlertsService",
"service," NS_ALERTSERVICE_CONTRACTID, PR_TRUE,
PR_TRUE, &prev);
if (prev)
nsMemory::Free(prev);
return rv;
}
static
NS_METHOD
nsAlertsServiceUnregister(nsIComponentManager* aCompMgr,
nsIFile* aPath,
const char* registryLocation,
const nsModuleComponentInfo* info)
{
nsresult rv;
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = catman->DeleteCategoryEntry("app-startup", "nsAlertsService", PR_TRUE);
return rv;
}
static const nsModuleComponentInfo components[] = static const nsModuleComponentInfo components[] =
{ {
{ "Alerts Service", { "Alerts Service",
NS_ALERTSSERVICE_CID, NS_ALERTSSERVICE_CID,
NS_ALERTSERVICE_CONTRACTID, NS_ALERTSERVICE_CONTRACTID,
nsAlertsServiceConstructor, nsAlertsServiceConstructor },
nsAlertsServiceRegister,
nsAlertsServiceUnregister },
}; };
NS_IMPL_NSGETMODULE(nsAlertsServiceModule, components) NS_IMPL_NSGETMODULE(nsAlertsServiceModule, components)