[vala] clutter-gtk-1.0: switch to GIR

[Evan Nemerson <evann src gnome org>]

commit 7a89d88f16ca5862e7f7ae95befa98d04bfa7d5f
Author: Evan Nemerson <evan coeus-group com>
Date:   Thu Jan 12 13:55:15 2012 -0800

    clutter-gtk-1.0: switch to GIR

 vapi/Makefile.am                                   |    2 +-
 vapi/clutter-gtk-1.0.vapi                          |   29 +++--
 vapi/metadata/GtkClutter-1.0-custom.vala           |   14 ++
 vapi/metadata/GtkClutter-1.0.metadata              |    4 +
 .../clutter-gtk-1.0/clutter-gtk-1.0.defines        |    1 -
 .../packages/clutter-gtk-1.0/clutter-gtk-1.0.files |    2 -
 vapi/packages/clutter-gtk-1.0/clutter-gtk-1.0.gi   |  143 --------------------
 .../clutter-gtk-1.0/clutter-gtk-1.0.metadata       |    8 -
 .../clutter-gtk-1.0/clutter-gtk-1.0.namespace      |    1 -
 9 files changed, 36 insertions(+), 168 deletions(-)
---
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 42b4ed5..05bde85 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -270,7 +270,7 @@ clutter-gtk-0.10:
 	$(GENVAPI) --library $(srcdir)/clutter-gtk-0.10 $(PACKAGESDIR)/clutter-gtk-0.10/clutter-gtk-0.10.gi
 
 clutter-gtk-1.0:
-	$(GENVAPI) --library $(srcdir)/clutter-gtk-1.0 $(PACKAGESDIR)/clutter-gtk-1.0/clutter-gtk-1.0.gi
+	$(GENVAPI) --library $(srcdir)/clutter-gtk-1.0 --metadatadir $(METADATADIR) $(METADATADIR)/GtkClutter-1.0-custom.vala --pkg clutter-1.0 --pkg gtk+-3.0 --pkg cogl-pango-1.0 $(GIRDIR)/GtkClutter-1.0.gir
 
 cogl-1.0:
 	$(GENVAPI) --library $(srcdir)/cogl-1.0 $(PACKAGESDIR)/cogl-1.0/cogl-1.0-custom.vala $(PACKAGESDIR)/cogl-1.0/cogl-1.0.gi
diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi
index 3d5800e..07886ff 100644
--- a/vapi/clutter-gtk-1.0.vapi
+++ b/vapi/clutter-gtk-1.0.vapi
@@ -1,8 +1,9 @@
 /* clutter-gtk-1.0.vapi generated by vapigen, do not modify. */
 
+[CCode (cprefix = "GtkClutter", gir_namespace = "GtkClutter", gir_version = "1.0", lower_case_cprefix = "gtk_clutter_")]
 namespace GtkClutter {
-	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-	public class Actor : Clutter.Actor, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor, Clutter.Container {
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_actor_get_type ()")]
+	public class Actor : Clutter.Actor, Atk.Implementor, Clutter.Animatable, Clutter.Container, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Actor ();
 		public unowned Gtk.Widget get_contents ();
@@ -12,30 +13,34 @@ namespace GtkClutter {
 		[NoAccessorMethod]
 		public Gtk.Widget contents { owned get; set construct; }
 	}
-	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_embed_get_type ()")]
 	public class Embed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Embed ();
 		public unowned Clutter.Actor get_stage ();
 	}
-	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-	public class Texture : Clutter.Texture, Clutter.Scriptable, Clutter.Animatable, Atk.Implementor {
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_texture_get_type ()")]
+	public class Texture : Clutter.Texture, Atk.Implementor, Clutter.Animatable, Clutter.Scriptable {
 		[CCode (has_construct_function = false, type = "ClutterActor*")]
 		public Texture ();
 		public static GLib.Quark error_quark ();
-		public bool set_from_icon_name (Gtk.Widget widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error;
+		public bool set_from_icon_name (Gtk.Widget? widget, string icon_name, Gtk.IconSize icon_size) throws GLib.Error;
 		public bool set_from_pixbuf (Gdk.Pixbuf pixbuf) throws GLib.Error;
 		public bool set_from_stock (Gtk.Widget widget, string stock_id, Gtk.IconSize icon_size) throws GLib.Error;
 	}
-	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", type_id = "gtk_clutter_window_get_type ()")]
 	public class Window : Gtk.Window, Atk.Implementor, Gtk.Buildable {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
 		public Window ();
 		public unowned Clutter.Actor get_stage ();
 	}
-	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false)]
-	public enum TextureError {
-		ID
+	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_")]
+	public errordomain TextureError {
+		[CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+		[Deprecated (replacement = "INVALID_STOCK_ID", since = "vala-0.16")]
+		ID,
+		[CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+		INVALID_STOCK_ID
 	}
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public const int CLUTTER_GTK_MAJOR_VERSION;
@@ -52,7 +57,7 @@ namespace GtkClutter {
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
 	public static GLib.OptionGroup get_option_group ();
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-	public static Clutter.InitError init ([CCode (array_length_pos = 0.9)] ref unowned string[] argv);
+	public static Clutter.InitError init ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv);
 	[CCode (cheader_filename = "clutter-gtk/clutter-gtk.h")]
-	public static Clutter.InitError init_with_args ([CCode (array_length_pos = 0.9)] ref unowned string[] argv, string parameter_string, [CCode (array_length = false)] GLib.OptionEntry[] entries, string? translation_domain) throws GLib.Error;
+	public static Clutter.InitError init_with_args ([CCode (array_length_cname = "argc", array_length_pos = 0.5)] ref unowned string[]? argv, string? parameter_string, [CCode (array_length = false, array_null_terminated = true)] GLib.OptionEntry[]? entries, string? translation_domain) throws GLib.Error;
 }
diff --git a/vapi/metadata/GtkClutter-1.0-custom.vala b/vapi/metadata/GtkClutter-1.0-custom.vala
new file mode 100644
index 0000000..2785904
--- /dev/null
+++ b/vapi/metadata/GtkClutter-1.0-custom.vala
@@ -0,0 +1,14 @@
+namespace GtkClutter {
+	public errordomain TextureError {
+		[Deprecated (since = "vala-0.16", replacement = "INVALID_STOCK_ID")]
+		[CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")]
+		ID
+	}
+
+	public const int CLUTTER_GTK_MAJOR_VERSION;
+	public const int CLUTTER_GTK_MICRO_VERSION;
+	public const int CLUTTER_GTK_MINOR_VERSION;
+	public const int CLUTTER_GTK_VERSION_HEX;
+	public const string CLUTTER_GTK_VERSION_S;
+	public static bool check_version (uint major, uint minor, uint micro);
+}
\ No newline at end of file
diff --git a/vapi/metadata/GtkClutter-1.0.metadata b/vapi/metadata/GtkClutter-1.0.metadata
new file mode 100644
index 0000000..99bbe7b
--- /dev/null
+++ b/vapi/metadata/GtkClutter-1.0.metadata
@@ -0,0 +1,4 @@
+TextureError errordomain
+  .texture_error_invalid_stock_id name="INVALID_STOCK_ID"
+get_option_group skip=false
+init*.argv unowned