Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 269806 : aTryLocaleCharset assertion : implemented aTryLocaleCharset case (r=cbie, sr=bz)

Browse Source
This commit is contained in:
jshin%mailaps.org 2004-11-16 18:04:45 +00:00
parent db17c93d73
commit bb156473d4
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
netwerk/mime/src/nsMIMEHeaderParamImpl.cpp
View File

@ -56,6 +56,7 @@
#include "nsIServiceManager.h" #include "nsIServiceManager.h"
#include "nsMIMEHeaderParamImpl.h" #include "nsMIMEHeaderParamImpl.h"
#include "nsReadableUtils.h" #include "nsReadableUtils.h"
#include "nsNativeCharsetUtils.h"
// static functions declared below are moved from mailnews/mime/src/comi18n.cpp // static functions declared below are moved from mailnews/mime/src/comi18n.cpp
@ -92,8 +93,6 @@ nsMIMEHeaderParamImpl::GetParameter(const nsACString& aHeaderVal,
getter_Copies(charset), aLang, getter_Copies(med)); getter_Copies(charset), aLang, getter_Copies(med));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
NS_ASSERTION(!aTryLocaleCharset, "aTryLocaleCharset not yet supported !");
// convert to UTF-8 after charset conversion and RFC 2047 decoding // convert to UTF-8 after charset conversion and RFC 2047 decoding
// if necessary. // if necessary.
@ -108,14 +107,21 @@ nsMIMEHeaderParamImpl::GetParameter(const nsACString& aHeaderVal,
cvtUTF8(do_GetService(NS_UTF8CONVERTERSERVICE_CONTRACTID, &rv)); cvtUTF8(do_GetService(NS_UTF8CONVERTERSERVICE_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv) && if (NS_SUCCEEDED(rv) &&
NS_SUCCEEDED(cvtUTF8->ConvertStringToUTF8(str1, NS_SUCCEEDED(cvtUTF8->ConvertStringToUTF8(str1,
PromiseFlatCString(aFallbackCharset).get(), PR_FALSE, str2))) PromiseFlatCString(aFallbackCharset).get(), PR_FALSE, str2))) {
CopyUTF8toUTF16(str2, aResult); CopyUTF8toUTF16(str2, aResult);
else return NS_OK;
CopyUTF8toUTF16(str1, aResult); }
} }
else
CopyUTF8toUTF16(str1, aResult); if (IsUTF8(str1)) {
return NS_OK; CopyUTF8toUTF16(str1, aResult);
return NS_OK;
}
if (aTryLocaleCharset)
return NS_CopyNativeToUnicode(str1, aResult);
return NS_ERROR_FAILURE;
} }
// moved almost verbatim from mimehdrs.cpp // moved almost verbatim from mimehdrs.cpp