summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2019-03-28 00:02:59 +0100
committerRico Tzschichholz <ricotz@ubuntu.com>2019-04-10 15:17:59 +0200
commit3719fc051ff45b74b301656facde2ffe35d1115c (patch)
tree4e7fb35788f6342b07ee34d08195157b496ee6df
parente8b0ee6ecdefebf37a870d9ecd2248772bcd62f1 (diff)
downloadvala-3719fc051ff45b74b301656facde2ffe35d1115c.tar.gz
gobject-introspection-1.0: Fix TypeInfo and TypeTag method references
Fixes https://gitlab.gnome.org/GNOME/vala/issues/778
-rw-r--r--vapi/gobject-introspection-1.0.vapi5
-rw-r--r--vapi/metadata/GIRepository-2.0-custom.vala2
-rw-r--r--vapi/metadata/GIRepository-2.0.metadata6
3 files changed, 8 insertions, 5 deletions
diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi
index ede727482..f798a348c 100644
--- a/vapi/gobject-introspection-1.0.vapi
+++ b/vapi/gobject-introspection-1.0.vapi
@@ -22,7 +22,7 @@ namespace GI {
[CCode (cheader_filename = "girepository.h", lower_case_cprefix = "g_base_info_", lower_case_csuffix = "base_info_gtype", ref_function = "g_base_info_ref", type_id = "g_base_info_gtype_get_type ()", unref_function = "g_base_info_unref")]
[Compact]
public class BaseInfo {
- [CCode (cname = "g_info_new")]
+ [CCode (cname = "g_info_new", has_construct_function = false)]
public BaseInfo (GI.InfoType type, GI.BaseInfo container, GI.Typelib typelib, uint32 offset);
public bool equal (GI.BaseInfo info2);
public unowned string get_attribute (string name);
@@ -225,7 +225,7 @@ namespace GI {
public bool is_foreign ();
public bool is_gtype_struct ();
}
- [CCode (cheader_filename = "girepository.h", type_id = "g_base_info_gtype_get_type ()")]
+ [CCode (cheader_filename = "girepository.h", lower_case_csuffix = "type_info", type_id = "g_base_info_gtype_get_type ()")]
[Compact]
public class TypeInfo : GI.BaseInfo {
public int get_array_fixed_size ();
@@ -401,6 +401,7 @@ namespace GI {
GHASH,
ERROR,
UNICHAR;
+ [CCode (cname = "g_type_tag_to_string")]
public static unowned string to_string (GI.TypeTag type);
}
[CCode (cheader_filename = "girepository.h", cprefix = "GI_VFUNC_", has_type_id = false)]
diff --git a/vapi/metadata/GIRepository-2.0-custom.vala b/vapi/metadata/GIRepository-2.0-custom.vala
index 34a8f7c14..3ebf7c868 100644
--- a/vapi/metadata/GIRepository-2.0-custom.vala
+++ b/vapi/metadata/GIRepository-2.0-custom.vala
@@ -2,7 +2,7 @@ namespace GI {
[CCode (cheader_filename = "girepository.h", ref_function = "g_base_info_ref", unref_function = "g_base_info_unref", lower_case_cprefix = "g_base_info_", type_id = "g_base_info_gtype_get_type ()")]
[Compact]
public class BaseInfo {
- [CCode (cname = "g_info_new")]
+ [CCode (cname = "g_info_new", has_construct_function = false)]
public BaseInfo (GI.InfoType type, GI.BaseInfo container, GI.Typelib typelib, uint32 offset);
}
}
diff --git a/vapi/metadata/GIRepository-2.0.metadata b/vapi/metadata/GIRepository-2.0.metadata
index 64313818c..49012cbf9 100644
--- a/vapi/metadata/GIRepository-2.0.metadata
+++ b/vapi/metadata/GIRepository-2.0.metadata
@@ -17,5 +17,7 @@ Repository
Typelib
.symbol.symbol out
-*_info_* symbol_type="method" instance_idx=0
-*_info_invoke throws="GI.InvokeError"
+*_info_invoke symbol_type="method" instance_idx=0 throws="GI.InvokeError"
+TypeInfo lower_case_csuffix="type_info"
+type_info_* symbol_type="method" parent="GI.TypeInfo" instance_idx=0 name="type_info_(.+)"
+type_tag_to_string parent="GI.TypeTag" symbol_type="method" instance_idx=0 name="to_string"