glib-2.0: Support GVariant as fundamental type

This requires GLib 2.25.10.

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index d1c0be0ca84368a110b5bfbdddbcc0375152a494..87cffa96e62f296ff9879c4ae47037f2034f3f22 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -1635,6 +1635,9 @@ public class Vala.GTypeModule : GErrorModule {
                        cspec.call = new CCodeIdentifier (param_spec_name);
                        if (param_spec_name == "g_param_spec_string") {
                                cspec.add_argument (new CCodeConstant ("NULL"));
+                       } else if (param_spec_name == "g_param_spec_variant") {
+                               cspec.add_argument (new CCodeConstant ("G_VARIANT_TYPE_ANY"));
+                               cspec.add_argument (new CCodeConstant ("NULL"));
                        } else if (prop.property_type.data_type.get_type_id () != "G_TYPE_POINTER") {
                                cspec.add_argument (new CCodeIdentifier (prop.property_type.data_type.get_type_id ()));
                        }

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index bb964cc997f0ba0cf589e5cca1f47632e878dd2d..48ccff0ebb06787b94a8417911048c9a5111000d 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -3903,7 +3903,7 @@ namespace GLib {
        }
 
        [Compact]
-       [CCode (ref_function = "g_variant_ref", unref_function = "g_variant_unref", ref_sink_function = "g_variant_ref_sink", type_id = "G_TYPE_VARIANT", type_signature = "v")]
+       [CCode (ref_function = "g_variant_ref", unref_function = "g_variant_unref", ref_sink_function = "g_variant_ref_sink", type_id = "G_TYPE_VARIANT", marshaller_type_name = "VARIANT", param_spec_function = "g_param_spec_variant", get_value_function = "g_value_get_variant", set_value_function = "g_value_set_variant", take_value_function = "g_value_take_variant", type_signature = "v")]
        public class Variant {
                public enum Class {
                        BOOLEAN, BYTE, INT16, UINT16, INT32, UINT32, INT64,