Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug # 20817: use default platform charset when reading in bookmarks until if/when we find a META charset tag that says to use something else. Review: ftang@netscape.com

Browse Source
This commit is contained in:
rjc%netscape.com 1999-12-23 21:38:16 +00:00
parent dc92b5dab3
commit 40b7d3eaf1
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xpfe/components/bookmarks/src/nsBookmarksService.cpp
View File

@ -89,6 +89,7 @@
#include "nsICharsetConverterManager.h"
#include "nsICharsetAlias.h"
#include "nsIPlatformCharset.h"
#ifdef DEBUG
#ifdef XP_MAC
@ -114,6 +115,14 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
#ifndef NS_IPLATFORMCHARSET_CID
// XXX this CID should be defined elsewhere
#define NS_IPLATFORMCHARSET_CID \
{ 0x84b0f182, 0xc6c7, 0x11d2, {0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 }}
#endif
static NS_DEFINE_CID(kPlatformCharsetCID, NS_IPLATFORMCHARSET_CID);
static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID);
@ -392,6 +401,22 @@ BookmarkParser::Init(nsFileSpec *fileSpec, nsIRDFDataSource *aDataSource)
mIEFavoritesRoot = nsnull;
mFoundIEFavoritesRoot = PR_FALSE;
nsresult rv;
NS_WITH_SERVICE(nsIPlatformCharset, platformCharset, kPlatformCharsetCID, &rv);
if (NS_SUCCEEDED(rv) && (platformCharset))
{
nsAutoString defaultCharset;
if (NS_SUCCEEDED(rv = platformCharset->GetCharset(kPlatformCharsetSel_4xBookmarkFile, defaultCharset)))
{
// found the default platform charset, now try and get a decoder from it to Unicode
NS_WITH_SERVICE(nsICharsetConverterManager, charsetConv, kCharsetConverterManagerCID, &rv);
if (NS_SUCCEEDED(rv) && (charsetConv))
{
rv = charsetConv->GetUnicodeDecoder(&defaultCharset, getter_AddRefs(mUnicodeDecoder));
}
}
}
if (fileSpec)
{
mContentsLen = fileSpec->GetFileSize();
@ -877,7 +902,8 @@ BookmarkParser::ParseBookmark(const nsString &aLine, const nsCOMPtr<nsIRDFContai
// Now do properly replace %22's (this is what 4.5 did, anyway...)
static const char kEscape22[] = "%22";
PRInt32 offset;
while ((offset = url.Find(kEscape22)) >= 0) {
while ((offset = url.Find(kEscape22)) >= 0)
{
url.SetCharAt(' ',offset);
url.Cut(offset + 1, sizeof(kEscape22) - 2);
}