corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 438744 - Folders with non uniform characters (accents, Chinese, Japanese, etc) in their names do not import over from Safari. (r=mano)

Browse Source
This commit is contained in:
Dietrich Ayala
2008-07-03 11:46:52 -07:00
parent aca957300d
commit 2ab26dd5da
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browser/components/migration/src/nsSafariProfileMigrator.cpp
View File

@@ -980,8 +980,8 @@ nsSafariProfileMigrator::ParseBookmarksFolder(CFArrayRef aChildren,
if (::CFDictionaryContainsKey(entry, CFSTR("Children")) &&
type.EqualsLiteral("WebBookmarkTypeList")) {
nsCAutoString title;
if (!GetDictionaryCStringValue(entry, CFSTR("Title"), title, kCFStringEncodingUTF8))
nsAutoString title;
if (!GetDictionaryStringValue(entry, CFSTR("Title"), title))
continue;
CFArrayRef children = (CFArrayRef)::CFDictionaryGetValue(entry,
@@ -1009,7 +1009,7 @@ nsSafariProfileMigrator::ParseBookmarksFolder(CFArrayRef aChildren,
// Encountered a Folder, so create one in our Bookmarks DataSource and then
// parse the contents of the Safari one into it...
PRInt64 folder;
rv |= aBookmarksService->CreateFolder(aParentFolder, title,
rv |= aBookmarksService->CreateFolder(aParentFolder, NS_ConvertUTF16toUTF8(title),
nsINavBookmarksService::DEFAULT_INDEX,
&folder);
rv |= ParseBookmarksFolder(children,