From 77fcd5046f6809ac28883b8e9c45fea45756c3bd Mon Sep 17 00:00:00 2001 From: "dietrich@mozilla.com" Date: Fri, 9 Nov 2007 12:20:37 -0800 Subject: [PATCH] Bug 402753 remove post-sql options checks from nsNavHistory::IsHistoryMenuQuery (r=sspitzer, a=drivers) --- .../components/places/src/nsNavHistory.cpp | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/toolkit/components/places/src/nsNavHistory.cpp b/toolkit/components/places/src/nsNavHistory.cpp index 9900ef554f42..a8fe05442861 100644 --- a/toolkit/components/places/src/nsNavHistory.cpp +++ b/toolkit/components/places/src/nsNavHistory.cpp @@ -2131,36 +2131,9 @@ PRBool IsHistoryMenuQuery(const nsCOMArray& aQueries, nsNavHi if (aOptions->ExcludeItems()) return PR_FALSE; - if (aOptions->ExcludeQueries()) - return PR_FALSE; - - if (aOptions->ExcludeReadOnlyFolders()) - return PR_FALSE; - if (aOptions->IncludeHidden()) return PR_FALSE; - if (aOptions->ShowSessions()) - return PR_FALSE; - - if (aOptions->ResolveNullBookmarkTitles()) - return PR_FALSE; - - if (aOptions->ApplyOptionsToContainers()) - return PR_FALSE; - - nsCString sortingAnnotation; - nsresult rv = aOptions->GetSortingAnnotation(sortingAnnotation); - NS_ENSURE_SUCCESS(rv, PR_FALSE); - if (!sortingAnnotation.IsEmpty()) - return PR_FALSE; - - nsCString parentAnnotationToExclude; - rv = aOptions->GetExcludeItemIfParentHasAnnotation(parentAnnotationToExclude); - NS_ENSURE_SUCCESS(rv, PR_FALSE); - if (!parentAnnotationToExclude.IsEmpty()) - return PR_FALSE; - if (aQuery->MinVisits() != -1 || aQuery->MaxVisits() != -1) return PR_FALSE;