gtk+-2.0, gtk+-3.0: fix return value of Gtk.AccelGroup.find

Fixes bug 617963.

diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index fed1382747623fc45b26f6dc638dbf87343302a6..0cfefc0a37a54dc3080fd121bf205977330a8366 100644 (file)
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -66,7 +66,7 @@ namespace Gtk {
                public void connect_by_path (string accel_path, GLib.Closure 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, void* data);
+               public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
                public static unowned Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
                public bool get_is_locked ();
                public Gdk.ModifierType get_modifier_mask ();

diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index a00981a8001479446452bd8ca03c6c99e39103b3..1c3388cdced7073cf2105ad9e136ecca7878a65f 100644 (file)
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -63,7 +63,7 @@ namespace Gtk {
                public void connect_by_path (string accel_path, GLib.Closure 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, void* data);
+               public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
                public static unowned Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
                public bool get_is_locked ();
                public Gdk.ModifierType get_modifier_mask ();

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 8e2d3085be26eeba80b9ae6a9fe76dc697a4077f..fc803003ebf84e2ae14c8be41e12dd14ed7d2653 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
@@ -21,6 +21,10 @@
  */
 
 namespace Gtk {
+       public class AccelGroup {
+               public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
+       }
+
        public struct Allocation {
                public int x;
                public int y;

diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 7b04c710c0ef711e14eeb733a28b6c667a1bbb61..c1a37f4c0fc0dd97c8266a03fc9bd7e8c6093aa7 100644 (file)
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -11,6 +11,7 @@ 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"
+gtk_accel_group_find hidden="1"
 GtkAccelKey is_value_type="1"
 gtk_accel_map_lookup_entry.key is_out="1"
 gtk_accelerator_parse.accelerator_key is_out="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 c30718c1be2612db44c4ad7db6225cdb11bba217..feabb3491e21a8d0a3dd5e589a124e554f8957df 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -21,6 +21,10 @@
  */
 
 namespace Gtk {
+       public class AccelGroup {
+               public Gtk.AccelKey* find (Gtk.AccelGroupFindFunc find_func);
+       }
+
        public struct Allocation {
                public int x;
                public int y;

diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 2dc8e435f35ffd958accdba54a32e4d90222ee96..6c34f0bb1fe35bd0e9714c17fe62f568bb922333 100644 (file)
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -11,6 +11,7 @@ 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"
+gtk_accel_group_find hidden="1"
 GtkAccelKey is_value_type="1"
 gtk_accel_map_lookup_entry.key is_out="1"
 gtk_accelerator_parse.accelerator_key is_out="1"