diff options
Diffstat (limited to 'camel/camel-mime-message.c')
-rw-r--r-- | camel/camel-mime-message.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 6bd1f7360e..aa15eeec5f 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -32,7 +32,10 @@ #include <string.h> #include <errno.h> -#include "camel-charset-map.h" +#include <gal/util/e-iconv.h> + +#include <e-util/e-time-utils.h> + #include "camel-mime-message.h" #include "camel-multipart.h" #include "camel-stream-mem.h" @@ -44,8 +47,6 @@ #include "camel-mime-filter-charset.h" #include "camel-mime-filter-bestenc.h" -#include "e-time-utils.h" - #define d(x) /* these 2 below should be kept in sync */ @@ -544,7 +545,7 @@ process_header (CamelMedium *medium, const char *header_name, const char *header g_free (message->subject); if (((CamelMimePart *) message)->content_type) { charset = header_content_type_param (((CamelMimePart *) message)->content_type, "charset"); - charset = camel_charset_canonical_name (charset); + charset = e_iconv_charset_name (charset); } else charset = NULL; message->subject = g_strstrip (header_decode_string (header_value, charset)); |