Created temporary link list, we need to link with something for gettext.
authorNot Zed <NotZed@Ximian.com>
Tue, 5 Nov 2002 09:05:24 +0000 (09:05 +0000)
committerMichael Zucci <zucchi@src.gnome.org>
Tue, 5 Nov 2002 09:05:24 +0000 (09:05 +0000)
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.

camel/ChangeLog
camel/Makefile.am
camel/camel-charset-map.c
camel/camel-filter-driver.c
camel/camel-html-parser.c
camel/camel-mime-part-utils.c
camel/camel-mime-utils.c
camel/camel-search-private.c
camel/camel-text-index.c
camel/camel.h

index 4330222..20ab8da 100644 (file)
@@ -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
index 7b6b45e..e6e9064 100644 (file)
@@ -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 \
index 981a903..be57d88 100644 (file)
@@ -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>
index c9e71a9..eee060d 100644 (file)
@@ -34,7 +34,6 @@
 #include <time.h>
 
 #include <glib.h>
-#include <gtk/gtk.h>
 
 #include "camel-filter-driver.h"
 #include "camel-filter-search.h"
index 2a59a13..313e40d 100644 (file)
@@ -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 */
index 42460b0..6269e93 100644 (file)
@@ -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"
index 4b1d429..85ccf38 100644 (file)
@@ -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"
 
index 7202254..80152e7 100644 (file)
@@ -43,7 +43,7 @@
 
 #include "camel-search-private.h"
 
-#include <gal/unicode/gunicode.h>
+#include <glib/gunicode.h>
 
 #define d(x)
 
index e340511..3d0e71a 100644 (file)
@@ -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;
 }
index c5f158e..3421423 100644 (file)
@@ -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);