From 82bf5ab001bbd923225f14097710a868cd1d6e5f Mon Sep 17 00:00:00 2001
From: "radha%netscape.com"
 <radha%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 5 Jul 1999 00:53:20 +0000
Subject: [PATCH] Activate the mailcomposer code only if NECKO is *not*
 defined. Mail composer header files are not found if NECKO is defined and
 thereby NECKO build fails.

git-svn-id: svn://10.0.0.236/trunk@38338 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpfe/appshell/src/nsWebShellWindow.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
index e075f5c263e..36b44fc7679 100644
--- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -102,9 +102,11 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 #include "nsIWindowMediator.h"
 
 //hack for M8 should go away after NECKO lands
+#ifndef NECKO
 #include "nsIObserverService.h"
 #include "nsIMsgComposeService.h"
 #include "nsMsgCompCID.h"
+#endif   /* NECKO  */
 
 /* Define Class IDs */
 static NS_DEFINE_IID(kWindowCID,           NS_WINDOW_CID);
@@ -127,7 +129,10 @@ static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID);
 
 static NS_DEFINE_IID(kIDocumentLoaderFactoryIID, NS_IDOCUMENTLOADERFACTORY_IID);
 static NS_DEFINE_CID(kLayoutDocumentLoaderFactoryCID, NS_LAYOUT_DOCUMENT_LOADER_FACTORY_CID);
+
+#ifndef NECKO
 static NS_DEFINE_CID(kMsgComposeServiceCID, NS_MSGCOMPOSESERVICE_CID);
+#endif   /* NECKO  */
 
 
 /* Define Interface IDs */
@@ -2799,6 +2804,7 @@ nsWebShellWindow::HandleUrl(const PRUnichar * aCommand, const PRUnichar * aURLSp
   if (offset2 == 0) {
     topic += "mailto";
 
+#ifndef NECKO
     //What a dirty hack. 
     nsresult rv;
     NS_WITH_SERVICE(nsIMsgComposeService, msgcompose, kMsgComposeServiceCID, &rv);
@@ -2806,6 +2812,7 @@ nsWebShellWindow::HandleUrl(const PRUnichar * aCommand, const PRUnichar * aURLSp
         return rv;
     }
     rv = msgcompose->OpenComposeWindow(nsnull, nsnull, 0, 0, nsnull);
+#endif  /* NECKO */
   }
   else {
     topic += "browser";