From 96495b7ceb9a64fae3f2fb4f18c5033fcf89ca11 Mon Sep 17 00:00:00 2001 From: "annie.sullivan%gmail.com" Date: Sat, 28 Jan 2006 01:32:46 +0000 Subject: [PATCH] Changed bookmarks set and get item title to use user titles instead of page titles. bug=320453 r=bryner keywords=fixed1.8.1 git-svn-id: svn://10.0.0.236/trunk@188381 18797224-902f-48f8-a5cc-f745e15eee43 --- .../browser/components/places/src/nsNavBookmarks.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mozilla/browser/components/places/src/nsNavBookmarks.cpp b/mozilla/browser/components/places/src/nsNavBookmarks.cpp index 080b2f15456..704ac4000cd 100644 --- a/mozilla/browser/components/places/src/nsNavBookmarks.cpp +++ b/mozilla/browser/components/places/src/nsNavBookmarks.cpp @@ -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