aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-folder-summary.c
diff options
context:
space:
mode:
author1 <NotZed@Ximian.com>2001-10-12 06:08:20 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-10-12 06:08:20 +0800
commita5fa3f992dd32fdf99bfcf550a8ce62df2b74d13 (patch)
treeae2d252c33e30e674ad58be332f3cd98e409e3db /camel/camel-folder-summary.c
parent736e73548cb39a7aaad61f01704ac60ccb74f79e (diff)
downloadgsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.gz
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.bz2
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.lz
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.xz
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.zst
gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.zip
Removed charset/locale charset lookup and iconv_open/close functions,
2001-10-11 <NotZed@Ximian.com> * camel-charset-map.[ch]: Removed charset/locale charset lookup and iconv_open/close functions, moved to gal. Fixed all callers. svn path=/trunk/; revision=13602
Diffstat (limited to 'camel/camel-folder-summary.c')
-rw-r--r--camel/camel-folder-summary.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index a83517ebcd..9179b63e6e 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -29,6 +29,8 @@
#include <errno.h>
#include <stdlib.h>
+#include <gal/util/e-iconv.h>
+
#include "camel-folder-summary.h"
#include <camel/camel-file-utils.h>
@@ -1492,7 +1494,7 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h)
&& (strcasecmp(charset, "us-ascii") == 0))
charset = NULL;
- charset = camel_charset_to_iconv(charset);
+ charset = e_iconv_charset_name(charset);
subject = summary_format_string(h, "subject", charset);
from = summary_format_address(h, "from");
@@ -1742,7 +1744,7 @@ content_info_new (CamelFolderSummary *s, struct _header_raw *h)
ci = camel_folder_summary_content_info_new (s);
- charset = camel_charset_locale_name ();
+ charset = e_iconv_locale_charset();
ci->id = header_msgid_decode (header_raw_find (&h, "content-id", NULL));
ci->description = header_decode_string (header_raw_find (&h, "content-description", NULL), NULL);
ci->encoding = header_content_encoding_decode (header_raw_find (&h, "content-transfer-encoding", NULL));
@@ -2447,7 +2449,7 @@ camel_message_info_new_from_header (struct _header_raw *header)
&& (strcasecmp(charset, "us-ascii") == 0))
charset = NULL;
- charset = camel_charset_to_iconv(charset);
+ charset = e_iconv_charset_name(charset);
subject = summary_format_string(header, "subject", charset);
from = summary_format_address(header, "from");