diff options
Diffstat (limited to 'camel/camel-mime-part.c')
| -rw-r--r-- | camel/camel-mime-part.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c index eb65dead4e..765a9af5b5 100644 --- a/camel/camel-mime-part.c +++ b/camel/camel-mime-part.c @@ -29,11 +29,8 @@ #include <string.h> #include <stdio.h> #include <ctype.h> - #include <errno.h> -#include <gal/util/e-iconv.h> - #include "camel-mime-parser.h" #include "camel-stream-mem.h" #include "camel-stream-filter.h" @@ -223,9 +220,10 @@ process_header(CamelMedium *medium, const char *header_name, const char *header_ switch (header_type) { case HEADER_DESCRIPTION: /* raw header->utf8 conversion */ g_free (mime_part->description); - if (mime_part->content_type) - charset = e_iconv_charset_name(header_content_type_param(mime_part->content_type, "charset")); - else + if (mime_part->content_type) { + charset = header_content_type_param (mime_part->content_type, "charset"); + charset = camel_charset_canonical_name (charset); + } else charset = NULL; mime_part->description = g_strstrip (header_decode_string (header_value, charset)); break; |