From 37af98188c94b614dcc54211bca1f7448f04cbd0 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 1 Oct 2001 20:31:03 +0000 Subject: If the charset is x-unknown, return the locale_charset. 2001-10-01 Jeffrey Stedfast * camel-charset-map.c (camel_charset_to_iconv): If the charset is x-unknown, return the locale_charset. svn path=/trunk/; revision=13281 --- camel/ChangeLog | 5 +++++ camel/camel-charset-map.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'camel') 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 + + * camel-charset-map.c (camel_charset_to_iconv): If the charset is + x-unknown, return the locale_charset. + 2001-10-01 Dan Winship * 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) { -- cgit cinnamon-2.8 FreeBSD GNOME current development ports (https://github.com/freebsd/freebsd-ports-gnome)
aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines