gtk+-2.0, gtk+-3.0: use delegates for relevant GClosure arguments

Fixes bug 624481.

4 files changed, 16 insertions, 8 deletions

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index e0621c081..e6f413e57 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -62,8 +62,8 @@ namespace Gtk {
 		[CCode (has_construct_function = false)]
 		public AccelGroup ();
 		public bool activate (GLib.Quark accel_quark, GLib.Object acceleratable, uint accel_key, Gdk.ModifierType accel_mods);
-		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, GLib.Closure closure);
-		public void connect_by_path (string accel_path, GLib.Closure closure);
+		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, [CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate closure);
+		public void connect_by_path (string accel_path, [CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate closure);
 		public bool disconnect (GLib.Closure closure);
 		public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
 		public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
@@ -97,7 +97,7 @@ namespace Gtk {
 		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
 		public bool refetch ();
-		public void set_accel_closure (GLib.Closure accel_closure);
+		public void set_accel_closure ([CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate accel_closure);
 		public void set_accel_widget (Gtk.Widget accel_widget);
 		[NoAccessorMethod]
 		public GLib.Closure accel_closure { owned get; set; }
@@ -7122,7 +7122,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
-	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 0776037a2..69cabda2e 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -59,8 +59,8 @@ namespace Gtk {
 		[CCode (has_construct_function = false)]
 		public AccelGroup ();
 		public bool activate (GLib.Quark accel_quark, GLib.Object acceleratable, uint accel_key, Gdk.ModifierType accel_mods);
-		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, GLib.Closure closure);
-		public void connect_by_path (string accel_path, GLib.Closure closure);
+		public void connect (uint accel_key, Gdk.ModifierType accel_mods, Gtk.AccelFlags accel_flags, [CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate closure);
+		public void connect_by_path (string accel_path, [CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate closure);
 		public bool disconnect (GLib.Closure closure);
 		public bool disconnect_key (uint accel_key, Gdk.ModifierType accel_mods);
 		public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
@@ -89,7 +89,7 @@ namespace Gtk {
 		public unowned Gtk.Widget get_accel_widget ();
 		public uint get_accel_width ();
 		public bool refetch ();
-		public void set_accel_closure (GLib.Closure accel_closure);
+		public void set_accel_closure ([CCode (type = "GClosure*")] owned Gtk.AccelGroupActivate accel_closure);
 		public void set_accel_widget (Gtk.Widget accel_widget);
 		[NoAccessorMethod]
 		public GLib.Closure accel_closure { owned get; set; }
@@ -6483,7 +6483,7 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate void AboutDialogActivateLinkFunc (Gtk.AboutDialog about, string link_);
-	[CCode (cheader_filename = "gtk/gtk.h", has_target = false)]
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupActivate (Gtk.AccelGroup accel_group, GLib.Object acceleratable, uint keyval, Gdk.ModifierType modifier);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public delegate bool AccelGroupFindFunc (Gtk.AccelKey key, GLib.Closure closure);
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index c16739a2a..91677c96d 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -11,8 +11,12 @@ gtk_about_dialog_set_url_hook.data hidden="1"
 gtk_about_dialog_set_url_hook.destroy hidden="1"
 gtk_about_dialog_set_url_hook type_name="void"
 gtk_accel_groups_from_object type_arguments="AccelGroup"
+GtkAccelGroupActivate has_target="1"
+gtk_accel_group_connect.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
+gtk_accel_group_connect_by_path.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_group_find hidden="1"
 GtkAccelKey is_value_type="1"
+gtk_accel_label_set_accel_closure.accel_closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_map_lookup_entry.key is_out="1"
 gtk_accelerator_parse.accelerator_key is_out="1"
 gtk_accelerator_parse.accelerator_mods is_out="1"
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 1b8d4c450..febbddc32 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -11,8 +11,12 @@ gtk_about_dialog_set_url_hook.data hidden="1"
 gtk_about_dialog_set_url_hook.destroy hidden="1"
 gtk_about_dialog_set_url_hook type_name="void"
 gtk_accel_groups_from_object type_arguments="AccelGroup"
+GtkAccelGroupActivate has_target="1"
+gtk_accel_group_connect.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
+gtk_accel_group_connect_by_path.closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_group_find hidden="1"
 GtkAccelKey is_value_type="1"
+gtk_accel_label_set_accel_closure.accel_closure type_name="AccelGroupActivate" transfer_ownership="1" ctype="GClosure*"
 gtk_accel_map_lookup_entry.key is_out="1"
 gtk_accelerator_parse.accelerator_key is_out="1"
 gtk_accelerator_parse.accelerator_mods is_out="1"