wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 380470 - "nsAppStartupNotifier shouldn't require components to implement nsIObserver". r=bsmedberg.

Browse Source
This commit is contained in:
bent.mozilla@gmail.com 2007-05-16 13:06:01 -07:00
parent a3bcee25d5
commit 64bf68504c
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
embedding/components/appstartup/src/nsAppStartupNotifier.cpp
View File

@ -20,6 +20,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Ben Turner <mozilla@songbirdnest.com
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -88,22 +89,22 @@ NS_IMETHODIMP nsAppStartupNotifier::Observe(nsISupports *aSubject, const char *a
// of the contractId then we create it as a service
// if not we do a createInstance
const char *pServicePrefix = "service,";
nsCAutoString cid(contractId);
PRInt32 serviceIdx = cid.Find(pServicePrefix);
nsCOMPtr<nsIObserver> startupObserver;
if (serviceIdx == 0)
startupObserver = do_GetService(cid.get() + strlen(pServicePrefix), &rv);
nsCOMPtr<nsISupports> startupInstance;
if (Substring(contractId, 0, 8).EqualsLiteral("service,"))
startupInstance = do_GetService(contractId.get() + 8, &rv);
else
startupObserver = do_CreateInstance(contractId, &rv);
startupInstance = do_CreateInstance(contractId, &rv);
if (NS_SUCCEEDED(rv)) {
rv = startupObserver->Observe(nsnull, aTopic, nsnull);
// mainly for debugging if you want to know if your observer worked.
NS_ASSERTION(NS_SUCCEEDED(rv), "Startup Observer failed!\n");
// Try to QI to nsIObserver
nsCOMPtr<nsIObserver> startupObserver =
do_QueryInterface(startupInstance, &rv);
if (NS_SUCCEEDED(rv)) {
rv = startupObserver->Observe(nsnull, aTopic, nsnull);
// mainly for debugging if you want to know if your observer worked.
NS_ASSERTION(NS_SUCCEEDED(rv), "Startup Observer failed!\n");
}
}
else {
#ifdef NS_DEBUG