From: Jiří Zárevúcky <zarevucky.jiri@gmail.com>
Date: Tue, 26 Jan 2010 19:52:45 +0000 (-0800)
Subject: glib-2.0: fix MarkupParser callbacks.
X-Git-Tag: 0.7.10~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e2a42d25bd76a9e4edd2520d9e4d8b24bf80366;p=thirdparty%2Fvala.git

glib-2.0: fix MarkupParser callbacks.

Fixes bug 607195.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a1c1f4c39..f37df462b 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -2860,15 +2860,20 @@ namespace GLib {
 		public void* pop ();
 	}
 	
-	public delegate void MarkupParserStartElementFunc (MarkupParseContext context, string element_name, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_names, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_values) throws MarkupError;
+	[CCode (cname = "GCallback")]
+	public static delegate void MarkupParserStartElementFunc (MarkupParseContext context, string element_name, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_names, [CCode (array_length = false, array_null_terminated = true)] string[] attribute_values, void* user_data) throws MarkupError;
 	
-	public delegate void MarkupParserEndElementFunc (MarkupParseContext context, string element_name) throws MarkupError;
+	[CCode (cname = "GCallback")]
+	public static delegate void MarkupParserEndElementFunc (MarkupParseContext context, string element_name, void* user_data) throws MarkupError;
 	
-	public delegate void MarkupParserTextFunc (MarkupParseContext context, string text, size_t text_len) throws MarkupError;
+	[CCode (cname = "GCallback")]
+	public static delegate void MarkupParserTextFunc (MarkupParseContext context, string text, size_t text_len, void* user_data) throws MarkupError;
 	
-	public delegate void MarkupParserPassthroughFunc (MarkupParseContext context, string passthrough_text, size_t text_len) throws MarkupError;
+	[CCode (cname = "GCallback")]
+	public static delegate void MarkupParserPassthroughFunc (MarkupParseContext context, string passthrough_text, size_t text_len, void* user_data) throws MarkupError;
 	
-	public delegate void MarkupParserErrorFunc (MarkupParseContext context, Error error);
+	[CCode (cname = "GCallback")]
+	public static delegate void MarkupParserErrorFunc (MarkupParseContext context, Error error, void* user_data);
 	
 	public struct MarkupParser {
 		public unowned MarkupParserStartElementFunc start_element;