Redo the BUILD_MAP code to not depend on libunicode. Now it only generates

	* camel-charset-map.c: Redo the BUILD_MAP code to not depend on
	libunicode. Now it only generates a map of "popular" 8bit
	encodings. (It's not worthwhile to support obscure encodings,
	because any mailer that supports them will support UTF8 too. And
	Chinese and Japanese use mostly the same UTF8 characters so you
	need to decide between those encodings based on the locale or
	the charset of the message you're replying to or the input
	method you used. So this is sufficient for camel_charset_best's
	use.)

	* camel-charset-map-private.h: Regenerated.

	* camel.c (camel_shutdown): Move #ifdefs around to prevent a
	warning.

svn path=/trunk/; revision=10055

1 files changed, 2 insertions, 2 deletions

diff --git a/camel/camel.c b/camel/camel.c
index 6ae93081d6..4a31b9e648 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -38,15 +38,15 @@
 
 gboolean camel_verbose_debug = FALSE;
 
+#ifdef HAVE_NSS
 static void
 camel_shutdown (void)
 {
-#ifdef HAVE_NSS
 	NSS_Shutdown ();
 	
 	PR_Cleanup ();
-#endif /* HAVE_NSS */
 }
+#endif /* HAVE_NSS */
 
 gint
 camel_init (const char *configdir, gboolean nss_init)