Bug 511242 Include nsBrowserStatusFilter.cpp in Thunderbird's components list. r=Neil,ted.mielczarek sr=dmose
authorMark Banner <bugzilla@standard8.plus.com>
Sat, 05 Sep 2009 08:24:07 +0100
changeset 32264 3f2d457dc885c14029343e596faa9bfcd29463d3
parent 32263 2600b11db97195fcf8d47518cc7d4a10bbaff97a
child 32265 447f60ab191ccb49180abc506b57212611885862
push idunknown
push userunknown
push dateunknown
reviewersNeil, ted.mielczarek, dmose
bugs511242
milestone1.9.3a1pre
Bug 511242 Include nsBrowserStatusFilter.cpp in Thunderbird's components list. r=Neil,ted.mielczarek sr=dmose
xpfe/components/Makefile.in
xpfe/components/build/Makefile.in
xpfe/components/build/nsModule.cpp
--- a/xpfe/components/Makefile.in
+++ b/xpfe/components/Makefile.in
@@ -78,9 +78,13 @@ ifdef MOZ_HAVE_BROWSER
 DIRS += \
         directory \
         $(NULL)
 
 # build should be last
 DIRS += build
 endif
 
+ifdef MOZ_THUNDERBIRD
+DIRS += build
+endif
+
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -49,25 +49,24 @@ IS_COMPONENT	= 1
 MODULE_NAME	= application
 LIBXUL_LIBRARY	= 1
 
 
 CPPSRCS		= nsModule.cpp
 
 include $(topsrcdir)/config/config.mk
 
+ifndef MOZ_THUNDERBIRD
 # General includes
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory
+endif
 
-# Non-Mac Browser requirements
-ifneq ($(MOZ_BUILD_APP),macbrowser)
 SHARED_LIBRARY_LIBS += ../../browser/src/$(LIB_PREFIX)mozbrwsr_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../../browser/src
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 EXTRA_DSO_LDOPTS += \
 	$(MOZ_UNICHARUTIL_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
--- a/xpfe/components/build/nsModule.cpp
+++ b/xpfe/components/build/nsModule.cpp
@@ -34,40 +34,41 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsIGenericFactory.h"
 #include "nsICategoryManager.h"
 #include "nsNetUtil.h"
 #include "nsXPIDLString.h"
+#ifndef MOZ_THUNDERBIRD
 #include "nsDirectoryViewer.h"
 #ifdef MOZ_RDF
 #include "rdf.h"
 #include "nsRDFCID.h"
 #endif
-
-#if !defined(MOZ_MACBROWSER)
-#include "nsBrowserStatusFilter.h"
+#include "nsCURILoader.h"
+#include "nsXPFEComponentsCID.h"
 #include "nsBrowserInstance.h"
 #endif
-#include "nsCURILoader.h"
-#include "nsXPFEComponentsCID.h"
 
+#include "nsBrowserStatusFilter.h"
+
+#ifndef MOZ_THUNDERBIRD
 #ifdef MOZ_RDF
 // Factory constructors
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsHTTPIndex, Init)
 #endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDirectoryViewerFactory)
-
-#if !defined(MOZ_MACBROWSER)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserInstance)
 #endif
 
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserStatusFilter)
+
+#ifndef MOZ_THUNDERBIRD
 static NS_METHOD
 RegisterProc(nsIComponentManager *aCompMgr,
              nsIFile *aPath,
              const char *registryLocation,
              const char *componentType,
              const nsModuleComponentInfo *info)
 {
     nsresult rv;
@@ -90,36 +91,35 @@ UnregisterProc(nsIComponentManager *aCom
 {
     nsresult rv;
     nsCOMPtr<nsICategoryManager> catman = do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
     if (NS_FAILED(rv)) return rv;
 
     return catman->DeleteCategoryEntry("Gecko-Content-Viewers",
                                        "application/http-index-format", PR_TRUE);
 }
+#endif
 
 static const nsModuleComponentInfo components[] = {
+#ifndef MOZ_THUNDERBIRD
    { "Directory Viewer", NS_DIRECTORYVIEWERFACTORY_CID,
       "@mozilla.org/xpfe/http-index-format-factory-constructor",
       nsDirectoryViewerFactoryConstructor, RegisterProc, UnregisterProc  },
 #ifdef MOZ_RDF
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_SERVICE_CONTRACTID,
       nsHTTPIndexConstructor },
     { "Directory Viewer", NS_HTTPINDEX_SERVICE_CID, NS_HTTPINDEX_DATASOURCE_CONTRACTID,
       nsHTTPIndexConstructor },
 #endif
-
-#if !defined(MOZ_MACBROWSER)
-    { NS_BROWSERSTATUSFILTER_CLASSNAME,
-      NS_BROWSERSTATUSFILTER_CID,
-      NS_BROWSERSTATUSFILTER_CONTRACTID,
-      nsBrowserStatusFilterConstructor
-    },
     { "nsBrowserInstance",
       NS_BROWSERINSTANCE_CID,
       NS_BROWSERINSTANCE_CONTRACTID,
       nsBrowserInstanceConstructor
     },
 #endif
-
+    { NS_BROWSERSTATUSFILTER_CLASSNAME,
+      NS_BROWSERSTATUSFILTER_CID,
+      NS_BROWSERSTATUSFILTER_CONTRACTID,
+      nsBrowserStatusFilterConstructor
+    },
 };
 
 NS_IMPL_NSGETMODULE(application, components)