[vala] gtk+-2.0, gtk+-3.0: fix return value of Gtk.AccelGroup.find
- From: Evan Nemerson <evann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gtk+-2.0, gtk+-3.0: fix return value of Gtk.AccelGroup.find
- Date: Sun, 20 Jun 2010 20:09:12 +0000 (UTC)
commit a71d8de130a2bf90941566fcf2bc8b1804b96dee
Author: Evan Nemerson <evan coeus-group com>
Date: Sun Jun 20 13:06:58 2010 -0700
gtk+-2.0, gtk+-3.0: fix return value of Gtk.AccelGroup.find
Fixes bug 617963.
vapi/gtk+-2.0.vapi | 2 +-
vapi/gtk+-3.0.vapi | 2 +-
vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala | 4 ++++
vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 1 +
vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala | 4 ++++
vapi/packages/gtk+-3.0/gtk+-3.0.metadata | 1 +
6 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index fed1382..0cfefc0 100644
--- 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 a00981a..1c3388c 100644
--- 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 8e2d308..fc80300 100644
--- 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 7b04c71..c1a37f4 100644
--- 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 c30718c..feabb34 100644
--- 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 2dc8e43..6c34f0b 100644
--- 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"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]