From 5083a5c6d34ef0248d456c57dbf3f4297d5e330c Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Tue, 15 Jun 1999 07:07:09 +0000 Subject: [PATCH] Small fix for non-Mac platforms in terms of where to look for search datafiles. --- rdf/datasource/src/nsSearchDataSource.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/rdf/datasource/src/nsSearchDataSource.cpp b/rdf/datasource/src/nsSearchDataSource.cpp index 340e9dc32c3c..fff19f16615e 100755 --- a/rdf/datasource/src/nsSearchDataSource.cpp +++ b/rdf/datasource/src/nsSearchDataSource.cpp @@ -912,6 +912,15 @@ SearchDataSource::GetSearchEngineList() // on Mac, use system's search files nsSpecialSystemDirectory searchSitesDir(nsSpecialSystemDirectory::Mac_InternetSearchDirectory); nsNativeFileSpec nativeDir(searchSitesDir); +#else + // on other platforms, use our search files + nsSpecialSystemDirectory searchSitesDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory); + // XXX we should get this from prefs? + searchSitesDir += "res"; + searchSitesDir += "rdf"; + searchSitesDir += "search"; + nsNativeFileSpec nativeDir(searchSitesDir); +#endif for (nsDirectoryIterator i(nativeDir); i.Exists(); i++) { const nsNativeFileSpec nativeSpec = (const nsNativeFileSpec &)i; @@ -982,10 +991,6 @@ SearchDataSource::GetSearchEngineList() } } } -#else - // on other platforms, use our search files -#endif - return(rv); }