Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-24 02:35:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 318817 r=beng: Import, store, and use bookmark keywords.

Browse Source 
Original committer: brettw%gmail.com
Original revision: 1.14
Original date: 2006/02/16 00:42:46
This commit is contained in:
benjamin%smedbergs.us 2006-07-18 16:43:53 +00:00
parent 48dafd20d6
commit 4bc45d3094
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/components/places/src/nsBookmarksHTML.cpp
View File

@ -113,6 +113,7 @@ static NS_DEFINE_CID(kParserCID, NS_PARSER_CID);
#define KEY_FEEDURL_LOWER "feedurl" #define KEY_FEEDURL_LOWER "feedurl"
#define KEY_LASTCHARSET_LOWER "last_charset" #define KEY_LASTCHARSET_LOWER "last_charset"
#define KEY_ICON_LOWER "icon" #define KEY_ICON_LOWER "icon"
#define KEY_SHORTCUTURL_LOWER "shortcuturl"
#define BOOKMARKS_MENU_ICON_URI "chrome://browser/skin/places/bookmarks_menu.png" #define BOOKMARKS_MENU_ICON_URI "chrome://browser/skin/places/bookmarks_menu.png"
#define BOOKMARKS_TOOLBAR_ICON_URI "chrome://browser/skin/places/bookmarks_toolbar.png" #define BOOKMARKS_TOOLBAR_ICON_URI "chrome://browser/skin/places/bookmarks_toolbar.png"
@ -565,6 +566,7 @@ BookmarkContentSink::HandleLinkBegin(const nsIParserNode& node)
nsAutoString feedUrl; nsAutoString feedUrl;
nsAutoString icon; nsAutoString icon;
nsAutoString lastCharset; nsAutoString lastCharset;
nsAutoString keyword;
PRInt32 attrCount = node.GetAttributeCount(); PRInt32 attrCount = node.GetAttributeCount();
for (PRInt32 i = 0; i < attrCount; i ++) { for (PRInt32 i = 0; i < attrCount; i ++) {
const nsAString& key = node.GetKeyAt(i); const nsAString& key = node.GetKeyAt(i);
@ -576,12 +578,15 @@ BookmarkContentSink::HandleLinkBegin(const nsIParserNode& node)
icon = node.GetValueAt(i); icon = node.GetValueAt(i);
} else if (key.LowerCaseEqualsLiteral(KEY_LASTCHARSET_LOWER)) { } else if (key.LowerCaseEqualsLiteral(KEY_LASTCHARSET_LOWER)) {
lastCharset = node.GetValueAt(i); lastCharset = node.GetValueAt(i);
} else if (key.LowerCaseEqualsLiteral(KEY_SHORTCUTURL_LOWER)) {
keyword = node.GetValueAt(i);
} }
} }
href.Trim(kWhitespace); href.Trim(kWhitespace);
feedUrl.Trim(kWhitespace); feedUrl.Trim(kWhitespace);
icon.Trim(kWhitespace); icon.Trim(kWhitespace);
lastCharset.Trim(kWhitespace); lastCharset.Trim(kWhitespace);
keyword.Trim(kWhitespace);
// ignore <a> tags that have no href: we don't know what to do with them // ignore <a> tags that have no href: we don't know what to do with them
if (href.IsEmpty()) { if (href.IsEmpty()) {
@ -613,6 +618,10 @@ BookmarkContentSink::HandleLinkBegin(const nsIParserNode& node)
if (! icon.IsEmpty()) if (! icon.IsEmpty())
SetFaviconForURI(frame.mPreviousLink, NS_ConvertUTF16toUTF8(icon)); SetFaviconForURI(frame.mPreviousLink, NS_ConvertUTF16toUTF8(icon));
// save the keyword, ignore errors
if (! keyword.IsEmpty())
mBookmarksService->SetKeywordForURI(frame.mPreviousLink, keyword);
// FIXME: save the last charset // FIXME: save the last charset
} }