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, 4 insertions, 3 deletions

diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index dac774bdf2..d7aa8763dd 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -201,7 +201,7 @@ void main(void)
 
 #include "camel-charset-map.h"
 #include "camel-charset-map-private.h"
-#include <unicode.h>
+#include <gal/unicode/gunicode.h>
 #include <locale.h>
 #include <string.h>
 #include <glib.h>
@@ -224,13 +224,14 @@ camel_charset_step(CamelCharset *c, const char *in, int len)
 
 	/* check what charset a given string will fit in */
 	while (inptr < inend) {
-		unicode_char_t c;
+		gunichar c;
 		const char *newinptr;
-		newinptr = unicode_get_utf8(inptr, &c);
+		newinptr = g_utf8_next_char(inptr);
 		if (newinptr == NULL) {
 			inptr++;
 			continue;
 		}
+		c = g_utf8_get_char(inptr);
 		inptr = newinptr;
 		if (c<=0xffff) {
 			mask &= charset_mask(c);