More UTF-8 handling

svn path=/trunk/; revision=5032

4 files changed, 17 insertions, 9 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index a593b52c95..cc7ea92a4b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-24  Lauris Kaplinski  <lauris@helixcode.com>
+
+	* camel-folder-summary.c (summary_build_content_info):
+	Use UTF-8 as default
+	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):
+	Use UTF-8 as default
+	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8
+	
 2000-08-17  Not Zed  <NotZed@HelixCode.com>
 
 	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 71456dbf4d..a990d87a9c 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1230,18 +1230,18 @@ summary_build_content_info(CamelFolderSummary *s, CamelMimeParser *mp)
 			charset = header_content_type_param(ct, "charset");
 			if (charset!=NULL
 			    && !(strcasecmp(charset, "us-ascii")==0
-				 || strcasecmp(charset, "iso-8859-1")==0)) {
-				d(printf(" Adding conversion filter from %s to iso-8859-1\n", charset));
+				 || strcasecmp(charset, "utf-8")==0)) {
+				d(printf(" Adding conversion filter from %s to UTF-8\n", charset));
 				mfc = g_hash_table_lookup(p->filter_charset, charset);
 				if (mfc == NULL) {
-					mfc = camel_mime_filter_charset_new_convert(charset, "iso-8859-1");
+					mfc = camel_mime_filter_charset_new_convert(charset, "UTF-8");
 					if (mfc)
 						g_hash_table_insert(p->filter_charset, g_strdup(charset), mfc);
 				}
 				if (mfc) {
 					chr_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)mfc);
 				} else {
-					g_warning("Cannot convert '%s' to 'iso-8859-1', message index may be corrupt", charset);
+					g_warning("Cannot convert '%s' to 'UTF-8', message index may be corrupt", charset);
 				}
 			}
 
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 646b0131b1..81f17aa098 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -96,13 +96,13 @@ simple_data_wrapper_construct_from_parser(CamelDataWrapper *dw, CamelMimeParser
 
 		if (charset!=NULL
 		    && !(strcasecmp(charset, "us-ascii")==0
-			 || strcasecmp(charset, "iso-8859-1")==0)) {
-			d(printf("Adding conversion filter from %s to iso-8859-1\n", charset));
-			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "iso-8859-1");
+			 || strcasecmp(charset, "utf-8")==0)) {
+			d(printf("Adding conversion filter from %s to UTF-8\n", charset));
+			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "UTF-8");
 			if (fch) {
 				chrid = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)fch);
 			} else {
-				g_warning("Cannot convert '%s' to 'iso-8859-1', message display may be corrupt", charset);
+				g_warning("Cannot convert '%s' to 'UTF-8', message display may be corrupt", charset);
 			}
 		}
 
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 68af633c44..781ae59c23 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -880,7 +880,7 @@ rfc2047_decode_word(const char *in, int len)
 			outbuf = outbase;
 
 			/* TODO: Should this cache iconv converters? */
-			ic = unicode_iconv_open("iso-8859-1", encname);
+			ic = unicode_iconv_open("UTF-8", encname);
 			if (ic != (unicode_iconv_t)-1) {
 				ret = unicode_iconv(ic, (const char **)&inbuf, &inlen, &outbuf, &outlen);
 				unicode_iconv_close(ic);