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

Changed bookmarks set and get item title to use user titles instead of page titles. bug=320453 r=bryner keywords=fixed1.8.1

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@188381 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
annie.sullivan%gmail.com
2006-01-28 01:32:46 +00:00
parent 12380399fe
commit 96495b7ceb
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/browser/components/places/src/nsNavBookmarks.cpp
View File

@@ -1011,7 +1011,7 @@ nsNavBookmarks::GetChildFolder(PRInt64 aFolder, const nsAString& aSubFolder,
NS_IMETHODIMP
nsNavBookmarks::SetItemTitle(nsIURI *aURI, const nsAString &aTitle)
{
return History()->SetPageTitle(aURI, aTitle);
return History()->SetPageUserTitle(aURI, aTitle);
}
@@ -1032,7 +1032,15 @@ nsNavBookmarks::GetItemTitle(nsIURI *aURI, nsAString &aTitle)
return NS_ERROR_INVALID_ARG;
}
return statement->GetString(nsNavHistory::kGetInfoIndex_Title, aTitle);
// First check for a user title
if (!statement->IsNull(nsNavHistory::kGetInfoIndex_UserTitle))
return statement->GetString(nsNavHistory::kGetInfoIndex_UserTitle, aTitle);
// If there is no user title, check for a history title.
rv = statement->GetString(nsNavHistory::kGetInfoIndex_Title, aTitle);
if (statement->IsNull(nsNavHistory::kGetInfoIndex_Title))
aTitle.SetIsVoid(PR_TRUE);
return rv;
}
NS_IMETHODIMP