From eeea2a186127b1be2ed29a048d4d0763e12a4495 Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Sat, 2 Feb 2002 21:13:10 +0000 Subject: [PATCH] fix for bug 108988 r=caillon@returnzero.com, sr=blake also fix a minor warning while I'm there git-svn-id: svn://10.0.0.236/trunk@113535 18797224-902f-48f8-a5cc-f745e15eee43 --- .../components/history/src/nsGlobalHistory.cpp | 15 ++++++++++++--- .../xpfe/components/history/src/nsGlobalHistory.h | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index e55a22d6f73..de964921aa4 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -1127,8 +1127,17 @@ nsGlobalHistory::IsVisited(const char *aURL, PRBool *_retval) nsCOMPtr row; rv = FindRow(kToken_URLColumn, aURL, getter_AddRefs(row)); - if (NS_FAILED(rv)) - *_retval = PR_FALSE; + if (NS_FAILED(rv)) { + // now try it with a "/" appended? + rv = FindRow(kToken_URLColumn, + PromiseFlatCString(nsDependentCString(aURL) + + nsDependentCString("/")).get(), + getter_AddRefs(row)); + if (NS_FAILED(rv)) + *_retval = PR_FALSE; + else + *_retval = PR_TRUE; + } else *_retval = PR_TRUE; @@ -2392,7 +2401,7 @@ nsGlobalHistory::CreateFindEnumerator(nsIRDFResource *aSource, nsresult nsGlobalHistory::CheckHostnameEntries() { - nsresult rv; + nsresult rv = NS_OK; mdb_err err; diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.h b/mozilla/xpfe/components/history/src/nsGlobalHistory.h index 42f0ee73aa2..e32203315a0 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.h +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.h @@ -409,8 +409,8 @@ protected: AutocompleteExclude* aExclude) : mHistory(aHistory), mURLColumn(aURLColumn), - mCommentColumn(aCommentColumn), mHiddenColumn(aHiddenColumn), + mCommentColumn(aCommentColumn), mExclude(aExclude), mSelectValue(aSelectValue) {}