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

diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index f69efde91f..f34d5f8c27 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -31,8 +31,6 @@
 
 #include "camel-charset-map.h"
 
-#include <gtk/gtk.h> /* for _() macro */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,8 +50,8 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include <unicode.h>
 #include <iconv.h>
+#include <gal/unicode/gunicode.h>
 
 #define d(x)
 
@@ -992,14 +990,13 @@ pgp_verify (CamelCipherContext *ctx, CamelStream *istream,
 			*outbuf = '\0';
 		} else {
 			const char *inptr, *inend;
-			unicode_char_t c;
 			
 			inptr = diagnostics;
 			inend = inptr + inlen;
 			
 			while (inptr && inptr < inend) {
-				inptr = unicode_get_utf8 (inptr, &c);
-				*outbuf++ = c & 0xff;
+				*outbuf++ = g_utf8_get_char (inptr) & 0xff;
+				inptr = g_utf8_next_char (inptr);
 			}
 			
 			*outbuf = '\0';