diff options
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 056a488f9b..f17ea3fea6 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2001-07-27 Jeffrey Stedfast <fejj@ximian.com> + + * camel-mime-utils.c (header_decode_param): Fix the fix that fixes + broken mailer behavior. We want to make sure that the user's + locale charset is non-NULL before we pass it off to + iconv_open(). If it *is* NULL, we want to use iso-8859-1. + 2001-07-26 Jeffrey Stedfast <fejj@ximian.com> * camel-url.c (camel_url_free): Allow the url to be NULL just like diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 8116829b7f..d4c9b1f8fc 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -1975,14 +1975,15 @@ header_decode_param (const char **in, char **paramp, char **valuep, int *is_rfc2 * attempt to save it by assuming it's in the user's * locale and converting to utf8 */ char *outbase, *outbuf, *p; - const char *inbuf; + const char *charset, *inbuf; int inlen, outlen; iconv_t ic; inbuf = value; inlen = strlen (inbuf); - ic = iconv_open ("UTF-8", camel_charset_locale_name ()); + charset = camel_charset_locale_name (); + ic = iconv_open ("UTF-8", charset ? charset : "ISO-8859-1"); if (ic != (iconv_t) -1) { int ret; |