Remove my iso8859-1 -> iso-8859-1 hack and use

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

	* camel-mime-utils.c (rfc2047_decode_word): Remove my iso8859-1 ->
	iso-8859-1 hack and use camel_charset_get_iconv_friendly_name()
	instead.
	(rfc2184_decode): Use camel_charset_get_iconv_friendly_name()

	* camel.c (camel_init): Call camel_charset_map_init().

	* camel-charset-map.c (camel_charset_map_init): New function to
	initialize the charset-equivalent lookup table. To be called by
	camel_init().
	(camel_charset_get_iconv_friendly_name): New function to try and
	convert a charset into something that iconv is more likely to
	accept.

svn path=/trunk/; revision=11235

1 files changed, 3 insertions, 0 deletions

diff --git a/camel/camel.c b/camel/camel.c
index aaf31ca775..4a7c8fd7bf 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -35,6 +35,7 @@
 #endif /* HAVE_NSS */
 
 #include "camel.h"
+#include "camel-charset-map.h"
 
 gboolean camel_verbose_debug = FALSE;
 
@@ -62,6 +63,8 @@ camel_init (const char *configdir, gboolean nss_init)
 	if (getenv ("CAMEL_VERBOSE_DEBUG"))
 		camel_verbose_debug = TRUE;
 	
+	camel_charset_map_init ();
+	
 #ifdef HAVE_NSS
 	if (nss_init) {
 		PR_Init (PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 10);