From 7e76774d399350e38f1cecc59b060c8f75af22d5 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.plus.com" <bugzilla%standard8.plus.com>
Date: Fri, 7 Sep 2007 14:25:04 +0000
Subject: [PATCH] Bug 393842 Move xpfe/components/search to suite/common
 r=kairo,sr=neil

---
 suite/browser/public/Makefile.in |  8 +++++--
 suite/browser/src/Makefile.in    | 40 ++++++++++++++++++++------------
 suite/build.mk                   |  1 -
 suite/build/Makefile.in          | 15 +++---------
 suite/build/nsSuiteModule.cpp    | 28 +++++++++++++++++++++-
 5 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/suite/browser/public/Makefile.in b/suite/browser/public/Makefile.in
index de2368410d6..17ab3a84ec7 100644
--- a/suite/browser/public/Makefile.in
+++ b/suite/browser/public/Makefile.in
@@ -42,11 +42,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),WINNT)
 MODULE		= suitebrowser
 XPIDL_MODULE	= suitebrowser
 
-XPIDLSRCS	= nsIUrlWidget.idl
+XPIDLSRCS = \
+	nsISearchService.idl \
+	$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+XPIDLSRCS += nsIUrlWidget.idl
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/suite/browser/src/Makefile.in b/suite/browser/src/Makefile.in
index b310806d0d4..128a94ba037 100644
--- a/suite/browser/src/Makefile.in
+++ b/suite/browser/src/Makefile.in
@@ -42,28 +42,38 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifeq ($(OS_ARCH),WINNT)
 MODULE		= suitebrowser
 LIBRARY_NAME	= suitebrowser_s
 META_COMPONENT  = suite
 
-REQUIRES	= \
-		  xpcom \
-		  string \
-		  docshell \
-		  dom \
-		  content \
-		  js \
-		  widget \
-		  gfx \
-		  layout \
-		  necko \
-		  $(NULL)
+REQUIRES = \
+	xpcom \
+	string \
+	docshell \
+	dom \
+	content \
+	js \
+	widget \
+	gfx \
+	layout \
+	necko \
+	pref \
+	rdf \
+	uconv \
+	intl \
+	appcomps \
+	$(NULL)
 
-CPPSRCS		= nsUrlWidget.cpp
+CPPSRCS = \
+	nsInternetSearchService.cpp \
+	nsLocalSearchService.cpp \
+	$(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += nsUrlWidget.cpp
+endif
 
 FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/suite/build.mk b/suite/build.mk
index f741368d320..21f9eddc635 100644
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -58,7 +58,6 @@ tier_app_dirs += editor/ui
 endif
 
 tier_app_dirs += \
-	xpfe/components/search \
 	xpfe/components/bookmarks \
 	themes \
 	suite \
diff --git a/suite/build/Makefile.in b/suite/build/Makefile.in
index ddee2f1479d..6913e2ef89d 100644
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -60,8 +60,8 @@ REQUIRES	= \
 		rdf \
 		unicharutil \
 		windowwatcher \
-		suitemigration \
 		suitebrowser \
+		suitemigration \
 		appcomps \
 		$(NULL)
 
@@ -72,23 +72,14 @@ CPPSRCS 	= \
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/suite/profile \
 		-I$(topsrcdir)/suite/profile/migration/src \
+		-I$(topsrcdir)/suite/browser/src \
 		$(NULL)
 
 SHARED_LIBRARY_LIBS = \
 	../profile/$(LIB_PREFIX)suiteprofile_s.$(LIB_SUFFIX) \
 	../profile/migration/src/$(LIB_PREFIX)suitemigration_s.$(LIB_SUFFIX) \
-        $(NULL)
-
-# For now browser items are windows only
-ifeq ($(OS_ARCH),WINNT)
-LOCAL_INCLUDES += \
-	-I$(topsrcdir)/suite/browser/src \
-	$(NULL)
-
-SHARED_LIBRARY_LIBS += \
 	../browser/src/$(LIB_PREFIX)suitebrowser_s.$(LIB_SUFFIX) \
-	$(NULL)
-endif # WINNT
+        $(NULL)
 
 # Link to gkgfx for GNOME shell service
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
diff --git a/suite/build/nsSuiteModule.cpp b/suite/build/nsSuiteModule.cpp
index d4b19e1cdca..f37e8dd1285 100644
--- a/suite/build/nsSuiteModule.cpp
+++ b/suite/build/nsSuiteModule.cpp
@@ -41,6 +41,10 @@
 #include "nsProfileMigrator.h"
 #include "nsSeamonkeyProfileMigrator.h"
 #include "nsThunderbirdProfileMigrator.h"
+#include "nsInternetSearchService.h"
+#include "nsLocalSearchService.h"
+#include "nsIGenericFactory.h"
+#include "nsRDFCID.h"
 
 #if defined(XP_WIN)
 #include "nsUrlWidget.h"
@@ -55,6 +59,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSuiteDirectoryProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThunderbirdProfileMigrator)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init)
 
 /////////////////////////////////////////////////////////////////////////////
 
@@ -84,7 +90,27 @@ static const nsModuleComponentInfo components[] = {
   { "Thunderbird Profile Migrator",
     NS_THUNDERBIRDPROFILEMIGRATOR_CID,
     NS_SUITEPROFILEMIGRATOR_CONTRACTID_PREFIX "thunderbird",
-    nsThunderbirdProfileMigratorConstructor }
+    nsThunderbirdProfileMigratorConstructor },
+
+  { "Local Search",
+    NS_RDFFINDDATASOURCE_CID,
+    NS_LOCALSEARCH_SERVICE_CONTRACTID,
+    LocalSearchDataSourceConstructor },
+
+  { "Local Search",
+    NS_RDFFINDDATASOURCE_CID,
+    NS_LOCALSEARCH_DATASOURCE_CONTRACTID,
+    LocalSearchDataSourceConstructor },
+
+  { "Internet Search",
+    NS_RDFSEARCHDATASOURCE_CID,
+    NS_INTERNETSEARCH_SERVICE_CONTRACTID,
+    InternetSearchDataSourceConstructor },
+
+  { "Internet Search",
+    NS_RDFSEARCHDATASOURCE_CID,
+    NS_INTERNETSEARCH_DATASOURCE_CONTRACTID,
+    InternetSearchDataSourceConstructor }
 };
 
 NS_IMPL_NSGETMODULE(SuiteModule, components)