From 8bc849bd9731ed5cb03488ed2e9614cd89d1b2e7 Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 4 May 2001 00:49:56 +0000
Subject: [PATCH] removal of nsIAppShellComponent stuff, for bug 76339
 sr=sspitzer

git-svn-id: svn://10.0.0.236/trunk@93868 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/build/nsMsgFactory.cpp   |  1 -
 .../mailnews/base/src/nsMessengerBootstrap.cpp | 18 +-----------------
 .../mailnews/base/src/nsMessengerBootstrap.h   |  5 +----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp
index 5c0e4fe2688..78c18d2a183 100644
--- a/mozilla/mailnews/base/build/nsMsgFactory.cpp
+++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp
@@ -38,7 +38,6 @@
 #include "nsMessenger.h"
 #include "nsMsgGroupRecord.h"
 
-#include "nsIAppShellComponent.h"
 #include "nsIRegistry.h"
 
 /* Include all of the interfaces our factory can generate components for */
diff --git a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
index fe484a5470b..e6e072746a8 100644
--- a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
+++ b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
@@ -33,7 +33,6 @@
 #include "nsIMsgFolderCache.h"
 #include "nsIPref.h"
 #include "nsIDOMWindow.h"
-#include "nsIAppShellService.h"
 #include "nsISupportsPrimitives.h"
 #include "nsIWindowWatcher.h"
 #include "nsString.h"
@@ -46,7 +45,7 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
 
 NS_IMPL_THREADSAFE_ADDREF(nsMessengerBootstrap);
 NS_IMPL_THREADSAFE_RELEASE(nsMessengerBootstrap);
-NS_IMPL_QUERY_INTERFACE3(nsMessengerBootstrap, nsIAppShellComponent, nsICmdLineHandler, nsIMessengerWindowService);
+NS_IMPL_QUERY_INTERFACE2(nsMessengerBootstrap, nsICmdLineHandler, nsIMessengerWindowService);
 
 nsMessengerBootstrap::nsMessengerBootstrap()
 {
@@ -57,21 +56,6 @@ nsMessengerBootstrap::~nsMessengerBootstrap()
 {
 }
 
-nsresult
-nsMessengerBootstrap::Initialize(nsIAppShellService*,
-                                 nsICmdLineService*)
-{
-    return NS_OK;
-}
-
-nsresult
-nsMessengerBootstrap::Shutdown()
-{
-
-	return NS_OK;
-}
-
-
 CMDLINEHANDLER3_IMPL(nsMessengerBootstrap,"-mail","general.startup.mail","Start with mail.",NS_MAILSTARTUPHANDLER_CONTRACTID,"Mail Cmd Line Handler",PR_FALSE,"", PR_TRUE)
 
 NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask) 
diff --git a/mozilla/mailnews/base/src/nsMessengerBootstrap.h b/mozilla/mailnews/base/src/nsMessengerBootstrap.h
index c16cb7c4fa1..5e31149c329 100644
--- a/mozilla/mailnews/base/src/nsMessengerBootstrap.h
+++ b/mozilla/mailnews/base/src/nsMessengerBootstrap.h
@@ -26,8 +26,6 @@
 
 #include "nscore.h"
 #include "nsIServiceManager.h"
-#include "nsIAppShellService.h"
-#include "nsIAppShellComponent.h"
 #include "nsICmdLineHandler.h"
 #include "nsIMessengerWindowService.h"
 
@@ -37,14 +35,13 @@
   {0xb7, 0xf6, 0x00, 0x80, 0x5f, 0x05, 0xff, 0xa5}}
 
 
-class nsMessengerBootstrap : public nsIAppShellComponent, public nsICmdLineHandler, public nsIMessengerWindowService {
+class nsMessengerBootstrap : public nsICmdLineHandler, public nsIMessengerWindowService {
   
 public:
   nsMessengerBootstrap();
   virtual ~nsMessengerBootstrap();
   
   NS_DECL_ISUPPORTS  
-  NS_DECL_NSIAPPSHELLCOMPONENT
   NS_DECL_NSICMDLINEHANDLER
   NS_DECL_NSIMESSENGERWINDOWSERVICE
   CMDLINEHANDLER_REGISTERPROC_DECLS