Remove UNICODE_CFLAGS (and some other stuff that's redundant with

	* Makefile.am (INCLUDES): Remove UNICODE_CFLAGS (and some other
	stuff that's redundant with EXTRA_GNOME_CFLAGS)
	(libcamel_la_LIBADD): Replace UNICODE_LIBS with GAL_LIBS.

	* camel-search-private.c:
	* camel-pgp-context.c:
	* camel-mime-utils.c: Use gunicode interfaces rather than
	libunicode.

	* camel-charset-map.c: Use gunicode rather than libunicode. (The
	charmap-regen code still depends on libunicode though.)

	* camel-mime-filter-charset.h:
	* tests/message/test2.c (convert): Use iconv rather than
	unicode_iconv.

	* providers/smtp/Makefile.am (libcamelsmtp_la_LIBADD):
	* providers/pop3/Makefile.am (libcamelpop3_la_LIBADD):
	* providers/local/Makefile.am (libcamellocal_la_LIBADD): Remove
	UNICODE_LIBS.

	* camel.c (camel_init): Remove call to unicode_init.

	* camel-mime-parser.c: Remove unused unicode.h include.

svn path=/trunk/; revision=9585

1 files changed, 2 insertions, 2 deletions

diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h
index ba1586ca7a..f9c78e8896 100644
--- a/camel/camel-mime-filter-charset.h
+++ b/camel/camel-mime-filter-charset.h
@@ -22,7 +22,7 @@
 #define _CAMEL_MIME_FILTER_CHARSET_H
 
 #include <camel/camel-mime-filter.h>
-#include <unicode.h>
+#include <iconv.h>
 
 #define CAMEL_MIME_FILTER_CHARSET(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)
 #define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)
@@ -35,7 +35,7 @@ struct _CamelMimeFilterCharset {
 
 	struct _CamelMimeFilterCharsetPrivate *priv;
 
-	unicode_iconv_t ic;
+	iconv_t ic;
 	char *from;
 	char *to;
 };