aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-mime-message.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-02-21 05:04:19 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-02-21 05:04:19 +0800
commitabada7e2cd02933caa7a2643c0771b3ee7a63cfe (patch)
treedef1c8730c5190323d408d2058a837da47bdc1fb /camel/camel-mime-message.c
parent08c781ab889611a7b9ca1605b36361032cc80f7d (diff)
downloadgsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.gz
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.bz2
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.lz
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.xz
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.zst
gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.zip
Call camel_iconv_init(). (camel_shutdown): Call camel_iconv_shutdown().
2003-02-20 Jeffrey Stedfast <fejj@ximian.com> * camel.c (camel_init): Call camel_iconv_init(). (camel_shutdown): Call camel_iconv_shutdown(). * camel-sasl-digest-md5.c (digest_response): Updated to use camel-iconv and the new camel-charset-map functions. * camel-mime-utils.c: Updated to use camel-iconv and the new camel-charset-map functions. * camel-mime-part-utils.c (check_html_charset): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. (convert_buffer): Use camel-iconv. (simple_data_wrapper_construct_from_parser): Since camel_charset_iso_to_windows() returns the charset in it's canonical format, no need to re-canonicalise it. * camel-mime-part.c (process_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-mime-message.c (process_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-mime-filter-charset.c: Use camel-iconv. * camel-folder-summary.c (message_info_new): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. (content_info_new): Use camel_charset_locale_name(). (camel_message_info_new_from_header): Same as message_info_new(). * camel-search-private.c: Use g_alloca() instead of alloca(). * camel-filter-search.c (check_header): Use camel_charset_canonical_name() instead of e_iconv_charset_name() which is longer available. * camel-charset-map.c (camel_charset_locale_name): New function, replaces e_iconv_locale_charset(). (camel_charset_canonical_name): New function, similar to e_iconv_charset_name() but instead of returning the iconv-friendly name, it returns the canonical name. (g_iconv will do the iconv-friendly name conversions for us). svn path=/trunk/; revision=19977
Diffstat (limited to 'camel/camel-mime-message.c')
-rw-r--r--camel/camel-mime-message.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 428cfd061d..6bd1f7360e 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -30,11 +30,9 @@
#include <ctype.h>
#include <stdio.h>
#include <string.h>
-
-#include <gal/util/e-iconv.h>
-
#include <errno.h>
+#include "camel-charset-map.h"
#include "camel-mime-message.h"
#include "camel-multipart.h"
#include "camel-stream-mem.h"
@@ -544,9 +542,10 @@ process_header (CamelMedium *medium, const char *header_name, const char *header
break;
case HEADER_SUBJECT:
g_free (message->subject);
- if (((CamelMimePart *)message)->content_type)
- charset = e_iconv_charset_name(header_content_type_param(((CamelMimePart *)message)->content_type, "charset"));
- else
+ if (((CamelMimePart *) message)->content_type) {
+ charset = header_content_type_param (((CamelMimePart *) message)->content_type, "charset");
+ charset = camel_charset_canonical_name (charset);
+ } else
charset = NULL;
message->subject = g_strstrip (header_decode_string (header_value, charset));
break;