Convert to the iconv-friendly charset names.

2001-07-19  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-mime-filter-charset.c
	(camel_mime_filter_charset_new_convert): Convert to the
	iconv-friendly charset names.

	* providers/imap/camel-imap-store.c (create_folder): Fixed a
	compiler warning about returning without a value in a non-void
	function. Blah.

	* camel-mime-part.c (process_header): Pass the locale charset as
	the default_charset to header_decode_string().

	* camel-folder-summary.c (camel_folder_summary_format_string):
	Pass the locale charset as the default_charset to
	header_decode_string().
	(content_info_new): Same.

	* camel-mime-message.c (process_header): Pass the locale charset
	as the default_charset to header_decode_string().

	* camel-mime-utils.c (append_8bit): New helper function who's
	purpose is similar to append_latin1() but for 8bit text that we
	are assuming is not latin1.
	(header_decode_text): Now takes a default_charset parameter and
	calls append_8bit when appropriate.
	(header_decode_string): Also takes a default_charset parameter
	now.
	(header_decode_mailbox): Pass NULL as the default_charset to
	header_decode_string().

svn path=/trunk/; revision=11250

1 files changed, 3 insertions, 2 deletions

diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index d03da27c61..c007658553 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -405,17 +405,18 @@ camel_charset_get_iconv_friendly_name (const char *name)
 			new_charset[3] = '-';
 			memcpy (new_charset + 4, name + 3, len - 3);
 			new_charset[len + 1] = '\0';
-			g_hash_table_insert (iconv_charsets, g_strdup (name), new_charset);
 		} else {
 			/* *shrug* - add it to the hash table just the way it is? */
 			new_charset = g_strdup (name);
-			g_hash_table_insert (iconv_charsets, g_strdup (name), new_charset);
 		}
 		
+		g_hash_table_insert (iconv_charsets, g_strdup (name), new_charset);
 		charset = new_charset;
 	}
 	ICONV_CHARSETS_UNLOCK ();
 	
+	g_warning ("camel_charset_get_iconv_friendly_name (\"%s\") => \"%s\"", name, charset);
+	
 	return charset;
 }