alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-msg-file.c: don't try to over-optimize charset decoding; it broke iso-2022-jp

Browse Source
This commit is contained in:
djcb
2012-08-10 17:13:05 +03:00
parent d2a8ff697a
commit 4fa0c57d29
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/mu-msg-file.c
View File

@ -355,13 +355,6 @@ convert_to_utf8 (GMimePart *part, char *buffer)
{ {
GMimeContentType *ctype; GMimeContentType *ctype;
const char* charset; const char* charset;
unsigned char *cur;
/* optimization: if the buffer is plain ascii, no conversion
* is done... */
for (cur = (unsigned char*)buffer; *cur && *cur < 0x80; ++cur);
if (*cur == '\0')
return buffer;
ctype = g_mime_object_get_content_type (GMIME_OBJECT(part)); ctype = g_mime_object_get_content_type (GMIME_OBJECT(part));
g_return_val_if_fail (GMIME_IS_CONTENT_TYPE(ctype), NULL); g_return_val_if_fail (GMIME_IS_CONTENT_TYPE(ctype), NULL);
@ -371,21 +364,15 @@ convert_to_utf8 (GMimePart *part, char *buffer)
if (charset) { if (charset) {
char *utf8; char *utf8;
utf8 = mu_str_convert_to_utf8 utf8 = mu_str_convert_to_utf8
(buffer, (buffer, g_mime_charset_iconv_name (charset));
g_mime_charset_iconv_name (charset));
if (utf8) { if (utf8) {
g_free (buffer); g_free (buffer);
return utf8; return utf8;
} }
} else if (g_utf8_validate (buffer, -1, NULL)) { } else if (!g_utf8_validate (buffer, -1, NULL)) {
/* check if the buffer is valid utf8, even if it doesn't /* if it's already utf8, nothing to do otherwise: no
* say so explicitly... if that is the case, return it as-is */ charset at all, or conversion failed; ugly * hack:
replace all non-ascii chars with '.' */
/* nothing to do, buffer is already utf8 */
} else {
/* hmmm.... no charset at all, or conversion failed; ugly
* hack: replace all non-ascii chars with '.' */
mu_str_asciify_in_place (buffer); mu_str_asciify_in_place (buffer);
} }