[vala] glib-2.0: fix MarkupParser callbacks.
- From: Evan Nemerson <evann src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vala] glib-2.0: fix MarkupParser callbacks.
- Date: Tue, 26 Jan 2010 19:55:14 +0000 (UTC)
commit 2e2a42d25bd76a9e4edd2520d9e4d8b24bf80366
Author: JiÅ?à Zárevúcky <zarevucky jiri gmail com>
Date: Tue Jan 26 11:52:45 2010 -0800
glib-2.0: fix MarkupParser callbacks.
Fixes bug 607195.
vapi/glib-2.0.vapi | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index a1c1f4c..f37df46 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]