clutter-1.0: fix clutter_binding_pool_install_action binding

Fixes bug 624165.

diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi
index 47be1a2c03bcb8dcb838b154d80c7154682a3381..0dc6d86a80b620ad9ac19abc05cbc468afb3ea96 100644 (file)
--- a/vapi/clutter-1.0.vapi
+++ b/vapi/clutter-1.0.vapi
@@ -516,8 +516,8 @@ namespace Clutter {
                public static unowned Clutter.BindingPool find (string name);
                public unowned string find_action (uint key_val, Clutter.ModifierType modifiers);
                public static unowned Clutter.BindingPool get_for_class (void* klass);
-               public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
-               public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
+               public void install_action (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GCallback")] owned Clutter.BindingActionFunc callback);
+               public void install_closure (string action_name, uint key_val, Clutter.ModifierType modifiers, [CCode (type = "GClosure*")] owned Clutter.BindingActionFunc closure);
                public void override_action (uint key_val, Clutter.ModifierType modifiers, owned GLib.Callback callback);
                public void override_closure (uint key_val, Clutter.ModifierType modifiers, GLib.Closure closure);
                public void remove_action (uint key_val, Clutter.ModifierType modifiers);
@@ -1756,7 +1756,7 @@ namespace Clutter {
        public delegate double AlphaFunc (Clutter.Alpha alpha);
        [CCode (cheader_filename = "clutter/clutter.h")]
        public delegate void BehaviourForeachFunc (Clutter.Behaviour behaviour, Clutter.Actor actor);
-       [CCode (cheader_filename = "clutter/clutter.h", has_target = false)]
+       [CCode (cheader_filename = "clutter/clutter.h")]
        public delegate bool BindingActionFunc (GLib.Object gobject, string action_name, uint key_val, Clutter.ModifierType modifiers);
        [CCode (cheader_filename = "clutter/clutter.h")]
        public delegate void Callback (Clutter.Actor actor);

diff --git a/vapi/packages/clutter-1.0/clutter-1.0.metadata b/vapi/packages/clutter-1.0/clutter-1.0.metadata
index 2b6ff08f528735aa5abd3ccd6f42306a8cf67866..e8f5d4d7fbbc8cee49526b10a54bc3d6d5c89777 100644 (file)
--- a/vapi/packages/clutter-1.0/clutter-1.0.metadata
+++ b/vapi/packages/clutter-1.0/clutter-1.0.metadata
@@ -151,13 +151,16 @@ clutter_behaviour_rotate_set_direction hidden="1"
 clutter_behaviour_scale_get_bounds.* is_out="1"
 
 clutter_binding_pool_install_action.data hidden="1"
-clutter_binding_pool_install_action.callback transfer_ownership="1"
+clutter_binding_pool_install_action.callback transfer_ownership="1" type_name="BindingActionFunc" ctype="GCallback"
 clutter_binding_pool_install_action.notify hidden="1"
+clutter_binding_pool_install_closure.closure transfer_ownership="1" type_name="BindingActionFunc" ctype="GClosure*"
 
 clutter_binding_pool_override_action.data hidden="1"
 clutter_binding_pool_override_action.callback transfer_ownership="1"
 clutter_binding_pool_override_action.notify hidden="1"
 
+ClutterBindingActionFunc has_target="1"
+
 clutter_box_clutter_padding_* hidden="1"
 
 ClutterButtonEvent is_value_type="1"