From 74205e83d12157f4c3c379722a0e6736d19c13ce Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 25 Feb 2003 19:43:22 +0000 Subject: Same as the ones below. 2003-02-25 Jeffrey Stedfast * camel-mime-message.c: Same as the ones below. * camel-mime-part.c: Reverted back to pre-camel-iconv * camel-filter-search.c: Same as below. * camel-folder-summary.c: Reverted back to pre-camel-iconv * camel.c (camel_init): Reverted to pre-camel-iconv * camel-charset-map.c (camel_charset_locale_name): Removed (part of the revert). (camel_charset_canonical_name): Same. * camel-mime-filter-charset.c: Revert back to using e_iconv from GAL. * camel-mime-part-utils.c: Revert back to using e_iconv from GAL. * camel-mime-utils.c: Revert back to using e_iconv from GAL. * camel-sasl-digest-md5.c: Revert back to using e-iconv from GAL. svn path=/trunk/; revision=20056 --- camel/camel-mime-message.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'camel/camel-mime-message.c') 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 #include -#include "camel-charset-map.h" +#include + +#include + #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)); -- cgit