Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for bug #395445: Tag and Star icon both show for Location bar entries

Browse Source 
r=dietrich, a=mconnor for m8


git-svn-id: svn://10.0.0.236/trunk@235396 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%mozilla.org
2007-09-07 23:18:23 +00:00
parent ed8b529fa3
commit 4c0ecfb7cb
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/toolkit/components/places/src/nsNavHistoryAutoComplete.cpp
View File

@@ -331,22 +331,28 @@ nsNavHistory::StartSearch(const nsAString & aSearchString,
nsAutoString style;
aPreviousResult->GetStyleAt(i, style);
if (!style.Equals(NS_LITERAL_STRING("tag"))) {
nsAutoString url, title;
nsAutoString url;
aPreviousResult->GetValueAt(i, url);
aPreviousResult->GetCommentAt(i, title);
PRBool isMatch = CaseInsensitiveFindInReadable(mCurrentSearchString, url);
if (!isMatch)
isMatch = CaseInsensitiveFindInReadable(mCurrentSearchString, title);
// make sure the url isn't already listed, as a tag result
PRBool dummy;
if (!mCurrentResultURLs.Get(url, &dummy)) {
nsAutoString title;
aPreviousResult->GetCommentAt(i, title);
if (isMatch) {
nsAutoString image;
aPreviousResult->GetImageAt(i, image);
PRBool isMatch = CaseInsensitiveFindInReadable(mCurrentSearchString, url);
if (!isMatch)
isMatch = CaseInsensitiveFindInReadable(mCurrentSearchString, title);
mCurrentResultURLs.Put(url, PR_TRUE);
if (isMatch) {
nsAutoString image;
aPreviousResult->GetImageAt(i, image);
mCurrentResultURLs.Put(url, PR_TRUE);
rv = mCurrentResult->AppendMatch(url, title, image, style);
NS_ENSURE_SUCCESS(rv, rv);
rv = mCurrentResult->AppendMatch(url, title, image, style);
NS_ENSURE_SUCCESS(rv, rv);
}
}
}
}