GConf 1.0.6 overlapping gal 0.15

[Frederic Crozat <fcrozat mandrakesoft com>]

Hi,

Debian folks has found a problem in evolution 0.15 when gtkhtml is
compiled with gconf support. The problem is that both GConf and gal are
providing g_utf8_validate (probably both copied from glib2 :)) and they
overlap and crashes part of Evolution.

Havoc, could you merge Takuo patch (attached) to fix this problem with
GConf 1.0.6 ? (this patch has been integrated in Debian package and I've
integrated it in Mandrake cooker rpms last Friday)


-- 
Frédéric Crozat
MandrakeSoft

--- gconf-1.0.6.orig/gconf/gconf-internals.c
+++ gconf-1.0.6/gconf/gconf-internals.c
@@ -4287,12 +4287,12 @@
   3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0
 };
 
-const gchar * const g_utf8_skip = utf8_skip_data;
+// const gchar * const g_utf8_skip = utf8_skip_data;
 
 typedef guint32 gunichar;
 
 gboolean
-g_utf8_validate (const gchar  *str,
+gconf_g_utf8_validate (const gchar  *str,
                  gssize        max_len,    
                  const gchar **end)
 {
--- gconf-1.0.6.orig/gconf/gconf-internals.h
+++ gconf-1.0.6/gconf/gconf-internals.h
@@ -205,7 +205,8 @@
 gboolean gconf_value_validate  (GConfValue *value,
                                 GError    **err);
 
-gboolean g_utf8_validate (const gchar  *str,
+#define g_utf8_validate gconf_g_utf8_validate
+gboolean gconf_g_utf8_validate (const gchar  *str,
                           gssize        max_len,    
                           const gchar **end);