Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nsIObserver and nsIObserverService API freeze. r=rpotts@netscape.com, alecf@netscape.com. bug 99163

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@105800 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%netscape.com
2001-10-19 20:52:59 +00:00
parent 14658e7a61
commit cf60fc042e
134 changed files with 752 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -57,6 +57,7 @@
#include "nsIPluginStreamListener.h"
#include "nsIHTTPHeaderListener.h"
#include "nsIObserverService.h"
#include "nsObserverService.h"
#include "nsIHttpProtocolHandler.h"
#include "nsIHttpChannel.h"
#include "nsIUploadChannel.h"
@@ -2398,8 +2399,8 @@ nsPluginHostImpl::nsPluginHostImpl()
nsCOMPtr<nsIObserverService> obsService = do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
if (obsService)
{
obsService->AddObserver(this, NS_LITERAL_STRING("quit-application").get());
obsService->AddObserver(this, NS_ConvertASCIItoUCS2(NS_XPCOM_SHUTDOWN_OBSERVER_ID).get());
obsService->AddObserver(this, "quit-application", PR_FALSE);
obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
}
#ifdef PLUGIN_LOGGING
@@ -2430,8 +2431,8 @@ nsPluginHostImpl::~nsPluginHostImpl()
nsCOMPtr<nsIObserverService> obsService = do_GetService(NS_OBSERVERSERVICE_CONTRACTID);
if (obsService)
{
obsService->RemoveObserver(this, NS_LITERAL_STRING("quit-application").get());
obsService->RemoveObserver(this, NS_ConvertASCIItoUCS2(NS_XPCOM_SHUTDOWN_OBSERVER_ID).get());
obsService->RemoveObserver(this, "quit-application");
obsService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
}
Destroy();
}
@@ -5709,18 +5710,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i
////////////////////////////////////////////////////////////////////////
NS_IMETHODIMP nsPluginHostImpl::Observe(nsISupports *aSubject,
const PRUnichar *aTopic,
const char *aTopic,
const PRUnichar *someData)
{
#ifdef NS_DEBUG
nsAutoString topic(aTopic);
char * newString = ToNewCString(topic);
printf("nsPluginHostImpl::Observe \"%s\"\n", newString ? newString : "");
if (newString)
nsCRT::free(newString);
printf("nsPluginHostImpl::Observe \"%s\"\n", aTopic ? aTopic : "");
#endif
if (NS_ConvertASCIItoUCS2(NS_XPCOM_SHUTDOWN_OBSERVER_ID).Equals(aTopic) ||
NS_LITERAL_STRING("quit-application").Equals(aTopic))
if (!nsCRT::strcmp(NS_XPCOM_SHUTDOWN_OBSERVER_ID, aTopic) ||
!nsCRT::strcmp("quit-application", aTopic))
{
Destroy();
}

2
mozilla/modules/plugin/base/src/nsPluginHostImpl.h
View File

@@ -355,7 +355,7 @@ public:
// Methods from nsIObserver
NS_IMETHOD
Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData);
Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData);
// Methods from nsPIPluginHost
NS_IMETHOD