From de3697d303358d5768f800ddc8616d661f8cd767 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de" <cbiesinger%web.de>
Date: Tue, 6 Apr 2004 22:19:14 +0000
Subject: [PATCH] bug 234046, remove search plugins for bugzilla, mozilla.org
 and LXR patch by Matti Versen <matti@mversen.de> r=bsmedberg sr=tor a=asa

---
 profile/defaults/search.rdf                       | 11 -----------
 xpfe/components/search/datasets/Makefile.in       |  6 ------
 xpfe/components/search/datasets/bugzilla.gif      |  0
 xpfe/components/search/datasets/bugzilla.src      |  0
 xpfe/components/search/datasets/lxrmozilla.gif    |  0
 xpfe/components/search/datasets/lxrmozilla.src    |  0
 xpfe/components/search/datasets/mozilla.gif       |  0
 xpfe/components/search/datasets/mozilla.src       |  0
 xpfe/components/search/datasets/searchplugins.pkg | 13 -------------
 9 files changed, 30 deletions(-)
 delete mode 100644 xpfe/components/search/datasets/bugzilla.gif
 delete mode 100644 xpfe/components/search/datasets/bugzilla.src
 delete mode 100644 xpfe/components/search/datasets/lxrmozilla.gif
 delete mode 100644 xpfe/components/search/datasets/lxrmozilla.src
 delete mode 100644 xpfe/components/search/datasets/mozilla.gif
 delete mode 100644 xpfe/components/search/datasets/mozilla.src

diff --git a/profile/defaults/search.rdf b/profile/defaults/search.rdf
index 6fff7328d61..5aebea0d062 100644
--- a/profile/defaults/search.rdf
+++ b/profile/defaults/search.rdf
@@ -23,7 +23,6 @@
 
 <!DOCTYPE RDF 
 [
-<!ENTITY search.category.mozilla	"Mozilla">
 <!ENTITY search.category.web		"Web">
 ]
 >
@@ -38,10 +37,6 @@
 
   <RDF:Seq about="NC:SearchCategoryRoot">
   	<RDF:li>
-  		<RDF:Description about="urn:search:category:2">
-			<NC:title>&search.category.mozilla;</NC:title>
-  		</RDF:Description>
-
   		<RDF:Description about="urn:search:category:1">
 			<NC:title>&search.category.web;</NC:title>
   		</RDF:Description>
@@ -58,10 +53,4 @@
     <RDF:li resource="NC:SearchCategory?engine=urn:search:engine:jeeves.src" />
   </RDF:Seq>
 
-  <RDF:Seq about="NC:SearchCategory?category=urn:search:category:2">
-  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:mozilla.src" />
-  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:bugzilla.src" />
-  	<RDF:li resource="NC:SearchCategory?engine=urn:search:engine:lxrmozilla.src" />
-  </RDF:Seq>
-
 </RDF:RDF>
diff --git a/xpfe/components/search/datasets/Makefile.in b/xpfe/components/search/datasets/Makefile.in
index ca76af4ba9e..b5bdfcc3f00 100644
--- a/xpfe/components/search/datasets/Makefile.in
+++ b/xpfe/components/search/datasets/Makefile.in
@@ -36,18 +36,12 @@ FILES		= \
 	$(NULL)
 else
 FILES		= \
-	bugzilla.gif        \
-	bugzilla.src        \
 	dmoz.gif            \
 	dmoz.src            \
 	google.gif          \
 	google.src          \
 	jeeves.gif          \
 	jeeves.src          \
-	lxrmozilla.gif      \
-	lxrmozilla.src      \
-	mozilla.gif         \
-	mozilla.src         \
 	$(NULL)
 endif
 
diff --git a/xpfe/components/search/datasets/bugzilla.gif b/xpfe/components/search/datasets/bugzilla.gif
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/bugzilla.src b/xpfe/components/search/datasets/bugzilla.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/lxrmozilla.gif b/xpfe/components/search/datasets/lxrmozilla.gif
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/lxrmozilla.src b/xpfe/components/search/datasets/lxrmozilla.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/mozilla.gif b/xpfe/components/search/datasets/mozilla.gif
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/mozilla.src b/xpfe/components/search/datasets/mozilla.src
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/xpfe/components/search/datasets/searchplugins.pkg b/xpfe/components/search/datasets/searchplugins.pkg
index f3411a0597e..e69de29bb2d 100644
--- a/xpfe/components/search/datasets/searchplugins.pkg
+++ b/xpfe/components/search/datasets/searchplugins.pkg
@@ -1,13 +0,0 @@
-[xpfe-locale-US]
-dist/bin/searchplugins/bugzilla.gif
-dist/bin/searchplugins/bugzilla.src
-dist/bin/searchplugins/dmoz.gif
-dist/bin/searchplugins/dmoz.src
-dist/bin/searchplugins/google.gif
-dist/bin/searchplugins/google.src
-dist/bin/searchplugins/lxrmozilla.gif
-dist/bin/searchplugins/lxrmozilla.src
-dist/bin/searchplugins/mozilla.gif
-dist/bin/searchplugins/mozilla.src
-dist/bin/searchplugins/NetscapeSearch.gif
-dist/bin/searchplugins/NetscapeSearch.src