Bug 511242 Include nsBrowserStatusFilter.cpp in Thunderbird's components list. r=Neil,ted.mielczarek sr=dmose

xpfe/components/Makefile.in

@@ -83,4 +83,8 @@ DIRS += \
 DIRS += build
 endif
 
+ifdef MOZ_THUNDERBIRD
+DIRS += build
+endif
+
 include $(topsrcdir)/config/rules.mk

xpfe/components/build/Makefile.in

@@ -54,15 +54,14 @@ 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)

xpfe/components/build/nsModule.cpp

@@ -39,30 +39,31 @@
 #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 "nsBrowserInstance.h"
-#endif
 #include "nsCURILoader.h"
 #include "nsXPFEComponentsCID.h"
+#include "nsBrowserInstance.h"
+#endif
 
+#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,
@@ -95,8 +96,10 @@ UnregisterProc(nsIComponentManager *aCompMgr,
     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  },
@@ -106,20 +109,17 @@ static const nsModuleComponentInfo components[] = {
     { "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)