From 22bfbf8d904f058caa9836ae189c22f7a223cc5e Mon Sep 17 00:00:00 2001
From: "timeless%mac.com"
 <timeless%mac.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 31 May 2002 08:05:14 +0000
Subject: [PATCH] back out this morning's mess, it caused crashes at startup on
 unix (not mac or win .. oddly enough) #0  0x4197db8e in
 nsPluginHostImpl::~nsPluginHostImpl (this=0x81beca0, __in_chrg=3)     at
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp:2630 #1  0x4197dd61 in
 nsPluginHostImpl::Release (this=0x81beca0)     at
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp:2639 #2  0x4015a878 in
 nsObserverList::AddObserver (this=0x81bed08, anObserver=0x81becb0,
 ownsWeak=1)     at ../../dist/include/xpcom/nsCOMPtr.h:490 #3  0x4015b7da in
 nsObserverService::AddObserver (this=0x80f1678,     anObserver=0x81becb0,
 aTopic=0x419a2b73 "quit-application", ownsWeak=1)     at
 mozilla/xpcom/ds/nsObserverService.cpp:163

git-svn-id: svn://10.0.0.236/trunk@122411 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 9 ++++-----
 mozilla/modules/plugin/base/src/nsPluginHostImpl.h   | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index f6c90656ba8..fb7a63ceb0c 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -2604,8 +2604,8 @@ nsPluginHostImpl::nsPluginHostImpl()
   nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
   if (obsService)
   {
-    obsService->AddObserver(this, "quit-application", PR_TRUE);
-    obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
+    obsService->AddObserver(this, "quit-application", PR_FALSE);
+    obsService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_FALSE);
   }
 
 #ifdef PLUGIN_LOGGING
@@ -2636,15 +2636,14 @@ nsPluginHostImpl::~nsPluginHostImpl()
 }
 
 ////////////////////////////////////////////////////////////////////////
-NS_IMPL_ISUPPORTS8(nsPluginHostImpl,
+NS_IMPL_ISUPPORTS7(nsPluginHostImpl,
                    nsIPluginManager,
                    nsIPluginManager2,
                    nsIPluginHost,
                    nsIFileUtilities,
                    nsICookieStorage,
                    nsIObserver,
-                   nsPIPluginHost,
-                   nsISupportsWeakReference);
+                   nsPIPluginHost);
 ////////////////////////////////////////////////////////////////////////
 NS_METHOD
 nsPluginHostImpl::Create(nsISupports* aOuter, REFNSIID aIID, void** aResult)
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
index 0d7991ea9b3..96687a86ea7 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.h
@@ -51,7 +51,6 @@
 #include "nsPluginsDir.h"
 #include "nsVoidArray.h"  // array for holding "active" streams
 #include "nsIDirectoryService.h"
-#include "nsWeakReference.h"
 #include "nsWeakPtr.h"
 
 class ns4xPlugin;
@@ -178,8 +177,7 @@ class nsPluginHostImpl : public nsIPluginManager2,
                          public nsIFileUtilities,
                          public nsICookieStorage,
                          public nsIObserver,
-                         public nsPIPluginHost,
-                         public nsSupportsWeakReference
+                         public nsPIPluginHost
 {
 public:
   nsPluginHostImpl();