From b86a1c012afb2e02bee76a6116f9d8f116191eb2 Mon Sep 17 00:00:00 2001 From: "darin%meer.net" Date: Thu, 6 Sep 2007 22:07:40 +0000 Subject: [PATCH] fixing build bustage that results when places is enabled. patch by sullivan@gmail.com, r=darin --- suite/browser/src/nsInternetSearchService.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/suite/browser/src/nsInternetSearchService.cpp b/suite/browser/src/nsInternetSearchService.cpp index 2b4b638e9ee..4e0ac07b42b 100755 --- a/suite/browser/src/nsInternetSearchService.cpp +++ b/suite/browser/src/nsInternetSearchService.cpp @@ -76,7 +76,9 @@ #include "nsIHttpChannel.h" #include "nsIUploadChannel.h" #include "nsIInputStream.h" +#ifndef MOZ_PLACES #include "nsIBookmarksService.h" +#endif #include "nsIStringBundle.h" #include "nsIObserverService.h" #include "nsIURL.h" @@ -1720,6 +1722,7 @@ InternetSearchDataSource::GetAllCmds(nsIRDFResource* source, &isSearchResult); if (NS_SUCCEEDED(rv) && isSearchResult) { +#ifndef MOZ_PLACES nsCOMPtr datasource; if (NS_SUCCEEDED(rv = mRDFService->GetDataSource("rdf:bookmarks", getter_AddRefs(datasource)))) { @@ -1739,6 +1742,7 @@ InternetSearchDataSource::GetAllCmds(nsIRDFResource* source, } } } +#endif cmdArray->AppendElement(mNC_SearchCommand_AddQueryToBookmarks); cmdArray->AppendElement(mNC_BookmarkSeparator); @@ -1842,6 +1846,7 @@ InternetSearchDataSource::addToBookmarks(nsIRDFResource *src) } } +#ifndef MOZ_PLACES nsCOMPtr datasource; if (NS_SUCCEEDED(rv = mRDFService->GetDataSource("rdf:bookmarks", getter_AddRefs(datasource)))) { @@ -1857,6 +1862,7 @@ InternetSearchDataSource::addToBookmarks(nsIRDFResource *src) } } } +#endif return(NS_OK); } @@ -1910,6 +1916,7 @@ InternetSearchDataSource::addQueryToBookmarks(nsIRDFResource *src) } } +#ifndef MOZ_PLACES nsCOMPtr datasource; if (NS_SUCCEEDED(rv = mRDFService->GetDataSource("rdf:bookmarks", getter_AddRefs(datasource)))) { @@ -1918,6 +1925,7 @@ InternetSearchDataSource::addQueryToBookmarks(nsIRDFResource *src) rv = bookmarks->AddBookmarkImmediately(uriUni, value.get(), nsIBookmarksService::BOOKMARK_SEARCH_TYPE, nsnull); } +#endif return(NS_OK); }