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

bug 258223 : bookmark keyword quicksearch need a way to specify character encoding : r=vlad, sr=neil, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@235895 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jshin%mailaps.org 2007-09-12 17:51:40 +00:00
parent 05fb3e0d96
commit 9c93c4412b
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/suite/browser/public/nsIBookmarksService.idl
View File

@ -98,6 +98,8 @@ interface nsIBookmarksService : nsISupports
void updateLastVisitedDate(in string aURL, in wstring docCharset);
AString getLastCharset(in AUTF8String aURL);
string resolveKeyword(in wstring aName);
void importSystemBookmarks(in nsIRDFResource aParentFolder);

39
mozilla/suite/browser/src/nsBookmarksService.cpp
View File

@ -3666,6 +3666,45 @@ nsBookmarksService::UpdateBookmarkLastModifiedDate(nsIRDFResource *aSource)
return rv;
}
NS_IMETHODIMP
nsBookmarksService::GetLastCharset(const nsACString &aURL, nsAString &aCharset)
{
aCharset.Truncate();
nsCOMPtr<nsIRDFLiteral> urlLiteral;
nsresult rv = gRDF->GetLiteral(NS_ConvertUTF8toUCS2(aURL).get(),
getter_AddRefs(urlLiteral));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIRDFResource> bookmark;
rv = GetSource(kNC_URL, urlLiteral, PR_TRUE, getter_AddRefs(bookmark));
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIRDFNode> nodeType;
GetSynthesizedType(bookmark, getter_AddRefs(nodeType));
if (nodeType == kNC_Bookmark) {
nsCOMPtr<nsIRDFNode> charsetNode;
rv = GetTarget(bookmark, kWEB_LastCharset, PR_TRUE,
getter_AddRefs(charsetNode));
if (NS_FAILED(rv))
return rv;
if (charsetNode) {
nsCOMPtr<nsIRDFLiteral> charsetData(do_QueryInterface(charsetNode));
if (charsetData) {
const PRUnichar *charset;
charsetData->GetValueConst(&charset);
aCharset.Assign(charset);
}
}
}
return NS_OK;
}
NS_IMETHODIMP
nsBookmarksService::ResolveKeyword(const PRUnichar *aUserInput, char **aShortcutURL)
{