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
This commit is contained in:
parent
d357e19dc2
commit
eeea2a1861
@ -1127,8 +1127,17 @@ nsGlobalHistory::IsVisited(const char *aURL, PRBool *_retval)
|
||||
nsCOMPtr<nsIMdbRow> 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;
|
||||
|
||||
|
||||
@ -409,8 +409,8 @@ protected:
|
||||
AutocompleteExclude* aExclude) :
|
||||
mHistory(aHistory),
|
||||
mURLColumn(aURLColumn),
|
||||
mCommentColumn(aCommentColumn),
|
||||
mHiddenColumn(aHiddenColumn),
|
||||
mCommentColumn(aCommentColumn),
|
||||
mExclude(aExclude),
|
||||
mSelectValue(aSelectValue) {}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user