|
Lines 1586-1591
Link Here
|
| 1586 |
iconv_t cd; |
1586 |
iconv_t cd; |
| 1587 |
char *buf; |
1587 |
char *buf; |
| 1588 |
|
1588 |
|
|
|
1589 |
/* skip over the charset */ |
| 1589 |
if (!(inptr = memchr (inptr, '?', inend - inptr)) || inptr[2] != '?') |
1590 |
if (!(inptr = memchr (inptr, '?', inend - inptr)) || inptr[2] != '?') |
| 1590 |
return NULL; |
1591 |
return NULL; |
| 1591 |
|
1592 |
|
|
Lines 1644-1652
Link Here
|
| 1644 |
return g_strndup ((char *) decoded, declen); |
1645 |
return g_strndup ((char *) decoded, declen); |
| 1645 |
} |
1646 |
} |
| 1646 |
|
1647 |
|
| 1647 |
if ((cd = g_mime_iconv_open ("UTF-8", charset)) == (iconv_t) -1) { |
1648 |
if (!charset[0] || (cd = g_mime_iconv_open ("UTF-8", charset)) == (iconv_t) -1) { |
| 1648 |
w(g_warning ("Cannot convert from %s to UTF-8, header display may " |
1649 |
w(g_warning ("Cannot convert from %s to UTF-8, header display may " |
| 1649 |
"be corrupt: %s", charset, g_strerror (errno))); |
1650 |
"be corrupt: %s", charset[0] ? charset : "unspecified charset", |
|
|
1651 |
g_strerror (errno))); |
| 1650 |
|
1652 |
|
| 1651 |
return decode_8bit ((char *) decoded, declen); |
1653 |
return decode_8bit ((char *) decoded, declen); |
| 1652 |
} |
1654 |
} |