[vala] gtk+-2.0: make Gtk.AccelKey a struct

[Evan Nemerson <evann src gnome org>]

commit 7cac25d2c8d7809824d45bdefc1ad95124c21fb6
Author: Evan Nemerson <evan coeus-group com>
Date:   Thu May 13 22:55:31 2010 -0700

    gtk+-2.0: make Gtk.AccelKey a struct
    
    Fixes bug 617963.

 vapi/gtk+-2.0.vapi                       |   17 ++++++++---------
 vapi/packages/gtk+-2.0/gtk+-2.0.metadata |    1 +
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index e37749b..d189273 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 unowned Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
+		public Gtk.AccelKey find (Gtk.AccelGroupFindFunc find_func, void* data);
 		public static unowned Gtk.AccelGroup from_accel_closure (GLib.Closure closure);
 		public bool get_is_locked ();
 		public Gdk.ModifierType get_modifier_mask ();
@@ -83,14 +83,7 @@ namespace Gtk {
 	public class AccelGroupEntry {
 		public GLib.Quark accel_path_quark;
 		public weak GLib.Closure closure;
-		public weak Gtk.AccelKey key;
-	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class AccelKey {
-		public uint accel_flags;
-		public uint accel_key;
-		public Gdk.ModifierType accel_mods;
+		public Gtk.AccelKey key;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
@@ -5953,6 +5946,12 @@ namespace Gtk {
 		[HasEmitter]
 		public signal void sort_column_changed ();
 	}
+	[CCode (type_id = "GTK_TYPE_ACCEL_KEY", cheader_filename = "gtk/gtk.h")]
+	public struct AccelKey {
+		public uint accel_key;
+		public Gdk.ModifierType accel_mods;
+		public uint accel_flags;
+	}
 	[CCode (type_id = "GTK_TYPE_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
 	public struct ActionEntry {
 		public weak string name;
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index ffe1460..0d175bb 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"
+GtkAccelKey is_value_type="1"
 gtk_accelerator_parse.accelerator_key is_out="1"
 gtk_accelerator_parse.accelerator_mods is_out="1"
 gtk_action_get_proxies type_arguments="Widget"