Fix:core:Partially revert rev. 5571 to fix builds which use support/glib.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5576 ffa7fe5e-494d-0410-b361-a75ebd5db220

3 files changed, 8 insertions, 8 deletions

diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c
index 445481056..c9d33be56 100644
--- a/navit/gui/internal/gui_internal_html.c
+++ b/navit/gui/internal/gui_internal_html.c
@@ -209,7 +209,7 @@ html_image(struct gui_priv *this, const char **names, const char **values)
 }
 
 static void
-gui_internal_html_start(GMarkupParseContext *dummy, const char *tag_name, const char **names, const char **values, void *data, GError **error)
+gui_internal_html_start(void *dummy, const char *tag_name, const char **names, const char **values, void *data, void *error)
 {
 	struct gui_priv *this=data;
 	int i;
@@ -310,7 +310,7 @@ gui_internal_html_start(GMarkupParseContext *dummy, const char *tag_name, const
 }
 
 static void
-gui_internal_html_end(GMarkupParseContext *dummy, const char *tag_name, void *data, GError **error)
+gui_internal_html_end(void *dummy, const char *tag_name, void *data, void *error)
 {
 	struct gui_priv *this=data;
 	struct html *html;
@@ -401,7 +401,7 @@ gui_internal_set_refresh_callback(struct gui_priv *this, char *cond)
 }
 
 static void
-gui_internal_html_text(GMarkupParseContext *dummy, const char *text, gsize len, void *data, GError **error)
+gui_internal_html_text(void *dummy, const char *text, int len, void *data, void *error)
 {
 	struct gui_priv *this=data;
 	struct widget *w;
diff --git a/navit/xmlconfig.c b/navit/xmlconfig.c
index 36182be4d..2d87c2bac 100644
--- a/navit/xmlconfig.c
+++ b/navit/xmlconfig.c
@@ -1083,10 +1083,10 @@ parse_node_text(ezxml_t node, void *data, void (*start)(void *, const char *, co
 #endif
 
 void
-xml_parse_text(const char *document, void *data,
-	void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **),
-	void (*end)(GMarkupParseContext *, const char *, void *, GError **),
-	void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **)) {
+xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *),
+			                   void (*end)(void *, const char *, void *, void *),
+			                   void (*text)(void *, const char *, int, void *, void *))
+{
 #if !USE_EZXML
 	GMarkupParser parser = { start, end, text, NULL, NULL};
 	xml_context *context;
diff --git a/navit/xmlconfig.h b/navit/xmlconfig.h
index 833f96d33..8a56e3783 100644
--- a/navit/xmlconfig.h
+++ b/navit/xmlconfig.h
@@ -83,7 +83,7 @@ extern const int xml_attr_distance;
 /* prototypes */
 enum attr_type;
 struct object_func *object_func_lookup(enum attr_type type);
-void xml_parse_text(const char *document, void *data, void (*start)(GMarkupParseContext *, const char *, const char **, const char **, void *, GError **), void (*end)(GMarkupParseContext *, const char *, void *, GError **), void (*text)(GMarkupParseContext*, const char *, gsize, void *, GError **));
+void xml_parse_text(const char *document, void *data, void (*start)(void *, const char *, const char **, const char **, void *, void *), void (*end)(void *, const char *, void *, void *), void (*text)(void *, const char *, int, void *, void *));
 gboolean config_load(const char *filename, xmlerror **error);
 //static void xinclude(GMarkupParseContext *context, const gchar **attribute_names, const gchar **attribute_values, struct xmldocument *doc_old, xmlerror **error);