glib-2.0: fix MarkupParser callbacks.

Fixes bug 607195.

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a1c1f4c390cad41b853de8f502659dee890b0dd8..f37df462b972e117a9b21ae73172ec57d6434f5f 100644 (file)
--- 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;