Created temporary link list, we need to link with something for gettext.

2002-11-05  Not Zed  <NotZed@Ximian.com>

	* Makefile.am (camel_lock_helper_LDADD): Created temporary link
	list, we need to link with something for gettext.

	* camel.h: Remove gstring-util.h and hash-table-utils.h.

	* camel-text-index.c:
	(text_index_normalise): Changed for g_utf8_strdown api change.

	* camel-search-private.c:
	* camel-mime-utils.c:
	* camel-mime-part-utils.c:
	* camel-html-parser.c:
	* camel-charset-map.c: Include glib/gunicode.h from glib instead
	of gal.

	* camel-filter-driver.c: Remove include of gtk/gtk.h, should never
	have been there.

svn path=/trunk/; revision=18542

10 files changed, 34 insertions, 12 deletions

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 4330222638..20ab8da7f8 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,23 @@
+2002-11-05  Not Zed  <NotZed@Ximian.com>
+
+	* Makefile.am (camel_lock_helper_LDADD): Created temporary link
+	list, we need to link with something for gettext.
+
+	* camel.h: Remove gstring-util.h and hash-table-utils.h.
+
+	* camel-text-index.c: 
+	(text_index_normalise): Changed for g_utf8_strdown api change.
+
+	* camel-search-private.c:
+	* camel-mime-utils.c:
+	* camel-mime-part-utils.c:
+	* camel-html-parser.c:
+	* camel-charset-map.c: Include glib/gunicode.h from glib instead
+	of gal.
+
+	* camel-filter-driver.c: Remove include of gtk/gtk.h, should never
+	have been there.
+
 2002-11-01  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* camel-mime-utils.c (g_string_append_len): Removed. Glib2 has
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 7b6b45e0e5..e6e9064b73 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -230,13 +230,18 @@ camel_lock_helper_SOURCES = 			\
 	camel-lock.c				\
 	camel-lock.h
 
+# NOTE: This needs to be cleaned up, it shouldn't link with all this crap,
+# because it might be setuid.
+camel_lock_helper_LDADD =			\
+	$(libcamel_la_LIBADD)
+
 camel_index_control_SOURCES =			\
 	camel-index-control.c
 
 camel_index_control_LDADD =			\
 	$(libcamel_la_LIBADD)			\
-	libcamel.la				\
-	$(EVOLUTION_MAIL_LIBS)
+	libcamel.la
+#	$(EVOLUTION_MAIL_LIBS)
 
 install-exec-hook:
 	@if test -n "$(CAMEL_LOCK_HELPER_USER)"; then \
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 981a90314f..be57d882e8 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -200,7 +200,7 @@ int main (void)
 #include "camel-charset-map.h"
 #include "camel-charset-map-private.h"
 #include "string-utils.h"
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 #include <locale.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index c9e71a9008..eee060d08f 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -34,7 +34,6 @@
 #include <time.h>
 
 #include <glib.h>
-#include <gtk/gtk.h>
 
 #include "camel-filter-driver.h"
 #include "camel-filter-search.h"
diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c
index 2a59a136d4..313e40d2af 100644
--- a/camel/camel-html-parser.c
+++ b/camel/camel-html-parser.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 #include <ctype.h>
 
 /* if defined, must also compile in dump_tag() below somewhere */
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 42460b07da..6269e9391c 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 
 #include <gal/util/e-iconv.h>
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 
 #include "string-utils.h"
 #include "camel-mime-part-utils.h"
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 4b1d4297f3..85ccf383f1 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -48,7 +48,7 @@
 #include <regex.h>
 
 #include <glib.h>
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 #include <gal/util/e-iconv.h>
 #include "e-time-utils.h"
 
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index 7202254294..80152e7410 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -43,7 +43,7 @@
 
 #include "camel-search-private.h"
 
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 
 #define d(x)
 
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index e340511131..3d0e71a265 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -44,7 +44,7 @@
 #include "camel-block-file.h"
 #include "camel-partition-table.h"
 
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 
 #include <stdio.h>
 
@@ -819,7 +819,7 @@ text_index_normalise(CamelIndex *idx, const char *in, void *data)
 
 	/* Sigh, this is really expensive */
 	word = g_strdup(in); /*g_utf8_normalize(in, strlen(in), G_NORMALIZE_ALL);*/
-	g_utf8_strdown(word);
+	g_utf8_strdown(word, -1);
 
 	return word;
 }
diff --git a/camel/camel.h b/camel/camel.h
index c5f158e42d..34214237f9 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -81,8 +81,6 @@ extern "C" {
 #include <camel/camel-transport.h>
 #include <camel/camel-uid-cache.h>
 #include <camel/camel-url.h>
-#include <camel/gstring-util.h>
-#include <camel/hash-table-utils.h>
 #include <camel/string-utils.h>
 
 gint camel_init (const char *certdb_dir, gboolean nss_init);