gtk+-2.0,javascriptcoregtk-4.0: Wrong usage of CCode.type_cname attribute

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index 7291ac3813cbd1094d9b323c90435ed4b7fd2320..7569124971d116e889444429c03fd3cf5f6bbf4f 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -7518,7 +7518,7 @@ namespace Gtk {
        public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate void AccelMapForeach (void* data, string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool changed);
-       [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")]
+       [CCode (cheader_filename = "gtk/gtk.h", cname = "GCallback")]
        public delegate void ActionCallback (Gtk.Action action);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate int AssistantPageFunc (int current_page);
@@ -7578,7 +7578,7 @@ namespace Gtk {
        public delegate void PageSetupDoneFunc (Gtk.PageSetup page_setup);
        [CCode (cheader_filename = "gtk/gtk.h")]
        public delegate void PrintSettingsFunc (string key, string value);
-       [CCode (cheader_filename = "gtk/gtk.h", type_cname = "GCallback")]
+       [CCode (cheader_filename = "gtk/gtk.h", cname = "GCallback")]
        public delegate void RadioActionCallback (Gtk.Action action, Gtk.Action current);
        [CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
        public delegate bool RcPropertyParser (GLib.ParamSpec pspec, GLib.StringBuilder rc_string, GLib.Value property_value);

diff --git a/vapi/javascriptcoregtk-4.0.vapi b/vapi/javascriptcoregtk-4.0.vapi
index 423024869dec2c3c79ab4aea052abddc41802087..ec34b2b848a6ccb6df15995b055c8db484220526 100644 (file)
--- a/vapi/javascriptcoregtk-4.0.vapi
+++ b/vapi/javascriptcoregtk-4.0.vapi
@@ -385,7 +385,7 @@ namespace JSC {
                ENUMERABLE,
                WRITABLE
        }
-       [CCode (cheader_filename = "jsc/jsc.h", instance_pos = 1.9, type_cname = "GCallback")]
+       [CCode (cheader_filename = "jsc/jsc.h", cname = "GCallback", instance_pos = 1.9)]
        public delegate T ClassConstructorCb<T> (GLib.GenericArray<JSC.Value> values);
        [CCode (cheader_filename = "jsc/jsc.h", has_target = false)]
        public delegate bool ClassDeletePropertyFunction (JSC.Class jsc_class, JSC.Context context, void* instance, string name);
@@ -395,7 +395,7 @@ namespace JSC {
        public delegate JSC.Value? ClassGetPropertyFunction (JSC.Class jsc_class, JSC.Context context, void* instance, string name);
        [CCode (cheader_filename = "jsc/jsc.h", has_target = false)]
        public delegate bool ClassHasPropertyFunction (JSC.Class jsc_class, JSC.Context context, void* instance, string name);
-       [CCode (cheader_filename = "jsc/jsc.h", instance_pos = 2.9, type_cname = "GCallback")]
+       [CCode (cheader_filename = "jsc/jsc.h", cname = "GCallback", instance_pos = 2.9)]
        public delegate T ClassMethodCb<T> (JSC.Class instance, GLib.GenericArray<JSC.Value> values);
        [CCode (cheader_filename = "jsc/jsc.h", has_target = false)]
        public delegate bool ClassSetPropertyFunction (JSC.Class jsc_class, JSC.Context context, void* instance, string name, JSC.Value value);

diff --git a/vapi/metadata/JavaScriptCore-4.0-custom.vala b/vapi/metadata/JavaScriptCore-4.0-custom.vala
index 164c7e0596bbfc09d66f1316b2ef95f06970701d..0ba392d63957498c18c25fcacf86219223d7e457 100644 (file)
--- a/vapi/metadata/JavaScriptCore-4.0-custom.vala
+++ b/vapi/metadata/JavaScriptCore-4.0-custom.vala
@@ -159,8 +159,8 @@ namespace JS {
 }
 
 namespace JSC {
-       [CCode (type_cname = "GCallback", instance_pos = 1.9)]
+       [CCode (cname = "GCallback", instance_pos = 1.9)]
        public delegate T ClassConstructorCb<T> (GLib.GenericArray<JSC.Value> values);
-       [CCode (type_cname = "GCallback", instance_pos = 2.9)]
+       [CCode (cname = "GCallback", instance_pos = 2.9)]
        public delegate T ClassMethodCb<T> (JSC.Class instance, GLib.GenericArray<JSC.Value> values);
 }

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
index f2ad5121e0e68b7e24da5df52f4f4dc5f886350b..446a7bdda000574b8f6fe9d6c0f15d055e70d7c1 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -288,10 +288,10 @@ namespace Gtk {
        [CCode (has_target = false)]
        public delegate void CallbackMarshal (Object object, void* data, Arg[] args);
 
-       [CCode (type_cname = "GCallback")]
+       [CCode (cname = "GCallback")]
        public delegate void ActionCallback (Action action);
 
-       [CCode (type_cname = "GCallback")]
+       [CCode (cname = "GCallback")]
        public delegate void RadioActionCallback (Action action, Action current);
 
        [CCode (cheader_filename = "gtk/gtk.h")]