diff options
Diffstat (limited to 'camel')
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/camel-charset-map.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 4b98d3d9b3..6d3cd92791 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2001-10-01 Jeffrey Stedfast <fejj@ximian.com> + + * camel-charset-map.c (camel_charset_to_iconv): If the charset is + x-unknown, return the locale_charset. + 2001-10-01 Dan Winship <danw@ximian.com> * camel-provider.h: Fix up the provider flags to specify things diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c index dbd956a15d..02ea31a44c 100644 --- a/camel/camel-charset-map.c +++ b/camel/camel-charset-map.c @@ -399,7 +399,11 @@ camel_charset_to_iconv (const char *name) if (name == NULL) return NULL; - + + /* special-case hack... */ + if (!g_strcasecmp (name, "x-unknown")) + return locale_charset ? locale_charset : "iso-8859-1"; + ICONV_CHARSETS_LOCK (); charset = g_hash_table_lookup (iconv_charsets, name); if (!charset) { |