[vala/switch-to-gir: 4/7] girparser: Support reparenting static methods in namespace
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/switch-to-gir: 4/7] girparser: Support reparenting static methods in namespace
- Date: Wed, 10 Nov 2010 11:41:01 +0000 (UTC)
commit ae6587dcdffff2cc467761e0e4aa023f42672679
Author: Luca Bruno <lucabru src gnome org>
Date: Mon Nov 8 15:39:53 2010 +0100
girparser: Support reparenting static methods in namespace
vala/valagirparser.vala | 6 ++++--
vapi/packages/gio-2.0/Gio-2.0.metadata | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 1cb6232..342184a 100644
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1395,7 +1395,9 @@ public class Vala.GirParser : CodeVisitor {
} else if (reader.name == "bitfield") {
add_symbol_info (parse_bitfield ());
} else if (reader.name == "function") {
- current_namespace_methods.add (parse_method ("function"));
+ var method = parse_method ("function");
+ add_symbol_info (method);
+ current_namespace_methods.add (method);
} else if (reader.name == "callback") {
add_symbol_info (parse_callback ());
} else if (reader.name == "record") {
@@ -2768,7 +2770,7 @@ public class Vala.GirParser : CodeVisitor {
var ns_cprefix = ns.get_lower_case_cprefix ();
var methods = namespace_methods[ns];
foreach (var method in methods) {
- if (method.parent_node != null) {
+ if (method.parent_symbol != null) {
// fixed earlier by metadata
continue;
}
diff --git a/vapi/packages/gio-2.0/Gio-2.0.metadata b/vapi/packages/gio-2.0/Gio-2.0.metadata
index 0046791..86e4d24 100644
--- a/vapi/packages/gio-2.0/Gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/Gio-2.0.metadata
@@ -1,4 +1,5 @@
Gio name="GLib"
+content_type_* parent="GLib.ContentType" name="content_type_(.*)"
// Possible GI bugs
FileIOStream.seek.cancellable nullable
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]