From: Luca Bruno Date: Sun, 26 Jun 2011 16:57:22 +0000 (+0200) Subject: gtk+-2.0, gtk+-3.0: Fix ActionCallback bindings and usage in fields X-Git-Tag: 0.13.1~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca64f8124ac359aadaae33b2d4a6cfc06b8bae7;p=thirdparty%2Fvala.git gtk+-2.0, gtk+-3.0: Fix ActionCallback bindings and usage in fields Fix the regression introduced by commit 227214f0d92b06e029961. Fixes bug 653046. --- diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index c7e7eddbd..3f7727091 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -6249,7 +6249,7 @@ namespace Gtk { public weak string label; public weak string accelerator; public weak string tooltip; - [CCode (type = "GCallback")] + [CCode (type = "GCallback", delegate_target = false)] public weak Gtk.ActionCallback callback; } [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")] @@ -6424,7 +6424,7 @@ namespace Gtk { public weak string label; public weak string accelerator; public weak string tooltip; - [CCode (type = "GCallback")] + [CCode (type = "GCallback", delegate_target = false)] public weak Gtk.ActionCallback callback; public bool is_active; } @@ -7405,7 +7405,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", has_target = false)] + [CCode (cheader_filename = "gtk/gtk.h")] public delegate void ActionCallback (Gtk.Action action); [CCode (cheader_filename = "gtk/gtk.h")] public delegate int AssistantPageFunc (int current_page); diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 87edc2d7d..fded0f784 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -6057,7 +6057,7 @@ namespace Gtk { public weak string label; public weak string accelerator; public weak string tooltip; - [CCode (type = "GCallback")] + [CCode (type = "GCallback", delegate_target = false)] public weak Gtk.ActionCallback callback; } [CCode (type_id = "GTK_TYPE_ALLOCATION", cheader_filename = "gtk/gtk.h")] @@ -6245,7 +6245,7 @@ namespace Gtk { public weak string label; public weak string accelerator; public weak string tooltip; - [CCode (type = "GCallback")] + [CCode (type = "GCallback", delegate_target = false)] public weak Gtk.ActionCallback callback; public bool is_active; } @@ -7077,7 +7077,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", has_target = false)] + [CCode (cheader_filename = "gtk/gtk.h")] public delegate void ActionCallback (Gtk.Action action); [CCode (cheader_filename = "gtk/gtk.h")] public delegate int AssistantPageFunc (int current_page); 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 111cbb632..cf494bcba 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala +++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala @@ -106,7 +106,6 @@ namespace Gtk { [CCode (has_target = false)] public delegate void CallbackMarshal (Object object, void* data, Arg[] args); - [CCode (has_target = false)] public delegate void ActionCallback (Action action); public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in); diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 541b3fa56..396bb8a58 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -26,7 +26,7 @@ gtk_action_new.tooltip nullable="1" gtk_action_new.stock_id nullable="1" GtkAction::activate has_emitter="1" GtkActionEntry is_value_type="1" -GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0" +GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" no_delegate_target="1" value_owned="0" gtk_action_group_add_action_with_accel.accelerator nullable="1" gtk_action_group_add_actions.user_data hidden="0" gtk_action_group_add_actions_full.user_data hidden="0" @@ -650,7 +650,7 @@ gtk_toggle_action_new.tooltip nullable="1" gtk_toggle_action_new.stock_id nullable="1" GtkToggleAction::toggled has_emitter="1" GtkToggleActionEntry is_value_type="1" -GtkToggleActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0" +GtkToggleActionEntry.callback type_name="ActionCallback" ctype="GCallback" no_delegate_target="1" value_owned="0" GtkToggleButton::toggled has_emitter="1" GtkToolbar.GtkTooltips hidden="1" GtkToolbar.gpointer hidden="1" diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala index f17a93d2f..8ebe53b0f 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala +++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala @@ -68,7 +68,6 @@ namespace Gtk { public GLib.SList get_files (); } - [CCode (has_target = false)] public delegate void ActionCallback (Action action); public delegate void MenuPositionFunc (Gtk.Menu menu, out int x, out int y, out bool push_in); diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata index ce18e85c5..1bfcf9cda 100644 --- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata +++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata @@ -26,7 +26,7 @@ gtk_action_new.tooltip nullable="1" gtk_action_new.stock_id nullable="1" GtkAction::activate has_emitter="1" GtkActionEntry is_value_type="1" -GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0" +GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" no_delegate_target="1" value_owned="0" gtk_action_group_add_action_with_accel.accelerator nullable="1" gtk_action_group_add_actions.user_data hidden="0" gtk_action_group_add_actions_full.user_data hidden="0" @@ -725,7 +725,7 @@ gtk_toggle_action_new.tooltip nullable="1" gtk_toggle_action_new.stock_id nullable="1" GtkToggleAction::toggled has_emitter="1" GtkToggleActionEntry is_value_type="1" -GtkToggleActionEntry.callback type_name="ActionCallback" ctype="GCallback" value_owned="0" +GtkToggleActionEntry.callback type_name="ActionCallback" ctype="GCallback" no_delegate_target="1" value_owned="0" GtkToggleButton::toggled has_emitter="1" GtkToolbar.GtkTooltips hidden="1" GtkToolbar.gpointer hidden="1"