From 3b0f13f46f696ac9c4eeaf79bc79044bc698a9eb Mon Sep 17 00:00:00 2001
From: Juerg Billeter <j@bitron.ch>
Date: Thu, 22 Nov 2007 19:06:41 +0000
Subject: [PATCH] update to use vala-gen-introspect

2007-11-22  Juerg Billeter  <j@bitron.ch>

	* vapi/packages/libglade-2.0/: update to use vala-gen-introspect

	* vapi/libglade-2.0.vapi: regenerated

svn path=/trunk/; revision=702
---
 ChangeLog                                     |   6 +
 vapi/libglade-2.0.vapi                        |  63 ++--
 vapi/packages/libglade-2.0/libglade-2.0.files |   3 +-
 vapi/packages/libglade-2.0/libglade-2.0.gi    | 409 ++++++++++++++++++++++++++
 vapi/packages/libglade-2.0/libglade-2.0.gidl  | 402 -------------------------
 5 files changed, 448 insertions(+), 435 deletions(-)
 create mode 100644 vapi/packages/libglade-2.0/libglade-2.0.gi
 delete mode 100644 vapi/packages/libglade-2.0/libglade-2.0.gidl

diff --git a/ChangeLog b/ChangeLog
index 899a90e..5c5a49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-11-22  Jürg Billeter  <j@bitron.ch>
 
+	* vapi/packages/libglade-2.0/: update to use vala-gen-introspect
+
+	* vapi/libglade-2.0.vapi: regenerated
+
+2007-11-22  Jürg Billeter  <j@bitron.ch>
+
 	* vapi/packages/vte/: update to use vala-gen-introspect
 
 	* vapi/vte.vapi: regenerated
diff --git a/vapi/libglade-2.0.vapi b/vapi/libglade-2.0.vapi
index 8d51e6c..9ee9225 100644
--- a/vapi/libglade-2.0.vapi
+++ b/vapi/libglade-2.0.vapi
@@ -3,30 +3,6 @@
 [CCode (cprefix = "Glade", lower_case_cprefix = "glade_")]
 namespace Glade {
 	[CCode (cheader_filename = "glade/glade.h")]
-	public class XML : GLib.Object {
-		public weak Gtk.Widget build_widget (Glade.WidgetInfo info);
-		public bool @construct (string fname, string root, string domain);
-		public bool construct_from_buffer (string buffer, int size, string root, string domain);
-		public weak Gtk.AccelGroup ensure_accel ();
-		public static GLib.Type get_type ();
-		public weak Gtk.Widget get_widget (string name);
-		public weak GLib.List get_widget_prefix (string name);
-		public void handle_internal_child (Gtk.Widget parent, Glade.ChildInfo child_info);
-		public void handle_widget_prop (Gtk.Widget widget, string prop_name, string value_name);
-		public XML (string fname, string root, string domain);
-		public XML.from_buffer (string buffer, int size, string root, string domain);
-		public weak string relative_file (string filename);
-		public void set_common_params (Gtk.Widget widget, Glade.WidgetInfo info);
-		public void set_packing_property (Gtk.Widget parent, Gtk.Widget child, string name, string value);
-		public void set_toplevel (Gtk.Window window);
-		public bool set_value_from_string (GLib.ParamSpec pspec, string string, GLib.Value value);
-		public void signal_autoconnect ();
-		public void signal_autoconnect_full (Glade.XMLConnectFunc func, pointer user_data);
-		public void signal_connect (string handlername, GLib.Callback func);
-		public void signal_connect_data (string handlername, GLib.Callback func, pointer user_data);
-		public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func, pointer user_data);
-	}
-	[CCode (cheader_filename = "glade/glade.h")]
 	public class AccelInfo {
 		public uint key;
 		public Gdk.ModifierType modifiers;
@@ -92,14 +68,28 @@ namespace Glade {
 		public uint n_children;
 	}
 	[CCode (cheader_filename = "glade/glade.h")]
-	public class Parser {
-		public static weak Glade.Interface parse_buffer (string buffer, int len, string domain);
-		public static weak Glade.Interface parse_file (string file, string domain);
-	}
-	[CCode (cheader_filename = "glade/glade.h")]
-	public class Standard {
-		public void build_children (Gtk.Widget parent, Glade.WidgetInfo info);
-		public static weak Gtk.Widget build_widget (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
+	public class XML : GLib.Object {
+		public weak string filename;
+		public weak Gtk.Widget build_widget (Glade.WidgetInfo info);
+		public bool @construct (string fname, string root, string domain);
+		public bool construct_from_buffer (string buffer, int size, string root, string domain);
+		public weak Gtk.AccelGroup ensure_accel ();
+		public weak Gtk.Widget get_widget (string name);
+		public weak GLib.List get_widget_prefix (string name);
+		public void handle_internal_child (Gtk.Widget parent, Glade.ChildInfo child_info);
+		public void handle_widget_prop (Gtk.Widget widget, string prop_name, string value_name);
+		public XML (string fname, string root, string domain);
+		public XML.from_buffer (string buffer, int size, string root, string domain);
+		public weak string relative_file (string filename);
+		public void set_common_params (Gtk.Widget widget, Glade.WidgetInfo info);
+		public void set_packing_property (Gtk.Widget parent, Gtk.Widget child, string name, string value);
+		public void set_toplevel (Gtk.Window window);
+		public bool set_value_from_string (GLib.ParamSpec pspec, string string, GLib.Value value);
+		public void signal_autoconnect ();
+		public void signal_autoconnect_full (Glade.XMLConnectFunc func, pointer user_data);
+		public void signal_connect (string handlername, GLib.Callback func);
+		public void signal_connect_data (string handlername, GLib.Callback func, pointer user_data);
+		public void signal_connect_full (string handler_name, Glade.XMLConnectFunc func, pointer user_data);
 	}
 	public static delegate void ApplyCustomPropFunc (Glade.XML xml, Gtk.Widget widget, string propname, string value);
 	public static delegate void BuildChildrenFunc (Glade.XML xml, Gtk.Widget parent, Glade.WidgetInfo info);
@@ -107,12 +97,21 @@ namespace Glade {
 	public static delegate weak Gtk.Widget NewFunc (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 	public static delegate void XMLConnectFunc (string handler_name, GLib.Object object, string signal_name, string signal_data, GLib.Object connect_object, bool after, pointer user_data);
 	public static delegate weak Gtk.Widget XMLCustomWidgetHandler (Glade.XML xml, string func_name, string name, string string1, string string2, int int1, int int2, pointer user_data);
+	public const int MODULE_API_VERSION;
 	public static int enum_from_string (GLib.Type type, string string);
 	public static uint flags_from_string (GLib.Type type, string string);
 	public static weak string get_widget_name (Gtk.Widget widget);
 	public static weak Glade.XML get_widget_tree (Gtk.Widget widget);
+	public static void init ();
 	public static weak string module_check_version (int version);
+	public static void module_register_widgets ();
+	public static weak Glade.Interface parser_parse_buffer (string buffer, int len, string domain);
+	public static weak Glade.Interface parser_parse_file (string file, string domain);
+	public static void provide (string library);
 	public static void register_custom_prop (GLib.Type type, string prop_name, Glade.ApplyCustomPropFunc apply_prop);
 	public static void register_widget (GLib.Type type, Glade.NewFunc new_func, Glade.BuildChildrenFunc build_children, Glade.FindInternalChildFunc find_internal_child);
+	public static void require (string library);
 	public static void set_custom_handler (Glade.XMLCustomWidgetHandler handler, pointer user_data);
+	public static void standard_build_children (Glade.XML self, Gtk.Widget parent, Glade.WidgetInfo info);
+	public static weak Gtk.Widget standard_build_widget (Glade.XML xml, GLib.Type widget_type, Glade.WidgetInfo info);
 }
diff --git a/vapi/packages/libglade-2.0/libglade-2.0.files b/vapi/packages/libglade-2.0/libglade-2.0.files
index 9052ed3..2681f07 100644
--- a/vapi/packages/libglade-2.0/libglade-2.0.files
+++ b/vapi/packages/libglade-2.0/libglade-2.0.files
@@ -1 +1,2 @@
-glade
+include/libglade-2.0/glade
+lib/libglade-2.0.so
diff --git a/vapi/packages/libglade-2.0/libglade-2.0.gi b/vapi/packages/libglade-2.0/libglade-2.0.gi
new file mode 100644
index 0000000..c377665
--- /dev/null
+++ b/vapi/packages/libglade-2.0/libglade-2.0.gi
@@ -0,0 +1,409 @@
+<?xml version="1.0"?>
+<api version="1.0">
+	<namespace name="Glade">
+		<function name="enum_from_string" symbol="glade_enum_from_string">
+			<return-type type="gint"/>
+			<parameters>
+				<parameter name="type" type="GType"/>
+				<parameter name="string" type="char*"/>
+			</parameters>
+		</function>
+		<function name="flags_from_string" symbol="glade_flags_from_string">
+			<return-type type="guint"/>
+			<parameters>
+				<parameter name="type" type="GType"/>
+				<parameter name="string" type="char*"/>
+			</parameters>
+		</function>
+		<function name="get_widget_name" symbol="glade_get_widget_name">
+			<return-type type="char*"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+			</parameters>
+		</function>
+		<function name="get_widget_tree" symbol="glade_get_widget_tree">
+			<return-type type="GladeXML*"/>
+			<parameters>
+				<parameter name="widget" type="GtkWidget*"/>
+			</parameters>
+		</function>
+		<function name="init" symbol="glade_init">
+			<return-type type="void"/>
+		</function>
+		<function name="module_check_version" symbol="glade_module_check_version">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="version" type="gint"/>
+			</parameters>
+		</function>
+		<function name="module_register_widgets" symbol="glade_module_register_widgets">
+			<return-type type="void"/>
+		</function>
+		<function name="parser_parse_buffer" symbol="glade_parser_parse_buffer">
+			<return-type type="GladeInterface*"/>
+			<parameters>
+				<parameter name="buffer" type="gchar*"/>
+				<parameter name="len" type="gint"/>
+				<parameter name="domain" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="parser_parse_file" symbol="glade_parser_parse_file">
+			<return-type type="GladeInterface*"/>
+			<parameters>
+				<parameter name="file" type="gchar*"/>
+				<parameter name="domain" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="provide" symbol="glade_provide">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="library" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="register_custom_prop" symbol="glade_register_custom_prop">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="type" type="GType"/>
+				<parameter name="prop_name" type="gchar*"/>
+				<parameter name="apply_prop" type="GladeApplyCustomPropFunc"/>
+			</parameters>
+		</function>
+		<function name="register_widget" symbol="glade_register_widget">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="type" type="GType"/>
+				<parameter name="new_func" type="GladeNewFunc"/>
+				<parameter name="build_children" type="GladeBuildChildrenFunc"/>
+				<parameter name="find_internal_child" type="GladeFindInternalChildFunc"/>
+			</parameters>
+		</function>
+		<function name="require" symbol="glade_require">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="library" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="set_custom_handler" symbol="glade_set_custom_handler">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="handler" type="GladeXMLCustomWidgetHandler"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</function>
+		<function name="standard_build_children" symbol="glade_standard_build_children">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="self" type="GladeXML*"/>
+				<parameter name="parent" type="GtkWidget*"/>
+				<parameter name="info" type="GladeWidgetInfo*"/>
+			</parameters>
+		</function>
+		<function name="standard_build_widget" symbol="glade_standard_build_widget">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="widget_type" type="GType"/>
+				<parameter name="info" type="GladeWidgetInfo*"/>
+			</parameters>
+		</function>
+		<callback name="GladeApplyCustomPropFunc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="widget" type="GtkWidget*"/>
+				<parameter name="propname" type="gchar*"/>
+				<parameter name="value" type="gchar*"/>
+			</parameters>
+		</callback>
+		<callback name="GladeBuildChildrenFunc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="parent" type="GtkWidget*"/>
+				<parameter name="info" type="GladeWidgetInfo*"/>
+			</parameters>
+		</callback>
+		<callback name="GladeFindInternalChildFunc">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="parent" type="GtkWidget*"/>
+				<parameter name="childname" type="gchar*"/>
+			</parameters>
+		</callback>
+		<callback name="GladeNewFunc">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="widget_type" type="GType"/>
+				<parameter name="info" type="GladeWidgetInfo*"/>
+			</parameters>
+		</callback>
+		<callback name="GladeXMLConnectFunc">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="handler_name" type="gchar*"/>
+				<parameter name="object" type="GObject*"/>
+				<parameter name="signal_name" type="gchar*"/>
+				<parameter name="signal_data" type="gchar*"/>
+				<parameter name="connect_object" type="GObject*"/>
+				<parameter name="after" type="gboolean"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<callback name="GladeXMLCustomWidgetHandler">
+			<return-type type="GtkWidget*"/>
+			<parameters>
+				<parameter name="xml" type="GladeXML*"/>
+				<parameter name="func_name" type="gchar*"/>
+				<parameter name="name" type="gchar*"/>
+				<parameter name="string1" type="gchar*"/>
+				<parameter name="string2" type="gchar*"/>
+				<parameter name="int1" type="gint"/>
+				<parameter name="int2" type="gint"/>
+				<parameter name="user_data" type="gpointer"/>
+			</parameters>
+		</callback>
+		<struct name="GladeAccelInfo">
+			<field name="key" type="guint"/>
+			<field name="modifiers" type="GdkModifierType"/>
+			<field name="signal" type="gchar*"/>
+		</struct>
+		<struct name="GladeAtkActionInfo">
+			<field name="action_name" type="gchar*"/>
+			<field name="description" type="gchar*"/>
+		</struct>
+		<struct name="GladeAtkRelationInfo">
+			<field name="target" type="gchar*"/>
+			<field name="type" type="gchar*"/>
+		</struct>
+		<struct name="GladeChildInfo">
+			<field name="properties" type="GladeProperty*"/>
+			<field name="n_properties" type="guint"/>
+			<field name="child" type="GladeWidgetInfo*"/>
+			<field name="internal_child" type="gchar*"/>
+		</struct>
+		<struct name="GladeInterface">
+			<method name="destroy" symbol="glade_interface_destroy">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="interface" type="GladeInterface*"/>
+				</parameters>
+			</method>
+			<method name="dump" symbol="glade_interface_dump">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="interface" type="GladeInterface*"/>
+					<parameter name="filename" type="gchar*"/>
+				</parameters>
+			</method>
+			<field name="requires" type="gchar**"/>
+			<field name="n_requires" type="guint"/>
+			<field name="toplevels" type="GladeWidgetInfo**"/>
+			<field name="n_toplevels" type="guint"/>
+			<field name="names" type="GHashTable*"/>
+			<field name="strings" type="GHashTable*"/>
+		</struct>
+		<struct name="GladeProperty">
+			<field name="name" type="gchar*"/>
+			<field name="value" type="gchar*"/>
+		</struct>
+		<struct name="GladeSignalInfo">
+			<field name="name" type="gchar*"/>
+			<field name="handler" type="gchar*"/>
+			<field name="object" type="gchar*"/>
+			<field name="after" type="guint"/>
+		</struct>
+		<struct name="GladeWidgetInfo">
+			<field name="parent" type="GladeWidgetInfo*"/>
+			<field name="classname" type="gchar*"/>
+			<field name="name" type="gchar*"/>
+			<field name="properties" type="GladeProperty*"/>
+			<field name="n_properties" type="guint"/>
+			<field name="atk_props" type="GladeProperty*"/>
+			<field name="n_atk_props" type="guint"/>
+			<field name="signals" type="GladeSignalInfo*"/>
+			<field name="n_signals" type="guint"/>
+			<field name="atk_actions" type="GladeAtkActionInfo*"/>
+			<field name="n_atk_actions" type="guint"/>
+			<field name="relations" type="GladeAtkRelationInfo*"/>
+			<field name="n_relations" type="guint"/>
+			<field name="accels" type="GladeAccelInfo*"/>
+			<field name="n_accels" type="guint"/>
+			<field name="children" type="GladeChildInfo*"/>
+			<field name="n_children" type="guint"/>
+		</struct>
+		<object name="GladeXML" parent="GObject" type-name="GladeXML" get-type="glade_xml_get_type">
+			<method name="build_widget" symbol="glade_xml_build_widget">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="info" type="GladeWidgetInfo*"/>
+				</parameters>
+			</method>
+			<method name="construct" symbol="glade_xml_construct">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="fname" type="char*"/>
+					<parameter name="root" type="char*"/>
+					<parameter name="domain" type="char*"/>
+				</parameters>
+			</method>
+			<method name="construct_from_buffer" symbol="glade_xml_construct_from_buffer">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="buffer" type="char*"/>
+					<parameter name="size" type="int"/>
+					<parameter name="root" type="char*"/>
+					<parameter name="domain" type="char*"/>
+				</parameters>
+			</method>
+			<method name="ensure_accel" symbol="glade_xml_ensure_accel">
+				<return-type type="GtkAccelGroup*"/>
+				<parameters>
+					<parameter name="xml" type="GladeXML*"/>
+				</parameters>
+			</method>
+			<method name="get_widget" symbol="glade_xml_get_widget">
+				<return-type type="GtkWidget*"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="name" type="char*"/>
+				</parameters>
+			</method>
+			<method name="get_widget_prefix" symbol="glade_xml_get_widget_prefix">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="name" type="char*"/>
+				</parameters>
+			</method>
+			<method name="handle_internal_child" symbol="glade_xml_handle_internal_child">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="parent" type="GtkWidget*"/>
+					<parameter name="child_info" type="GladeChildInfo*"/>
+				</parameters>
+			</method>
+			<method name="handle_widget_prop" symbol="glade_xml_handle_widget_prop">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="prop_name" type="gchar*"/>
+					<parameter name="value_name" type="gchar*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="glade_xml_new">
+				<return-type type="GladeXML*"/>
+				<parameters>
+					<parameter name="fname" type="char*"/>
+					<parameter name="root" type="char*"/>
+					<parameter name="domain" type="char*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_from_buffer" symbol="glade_xml_new_from_buffer">
+				<return-type type="GladeXML*"/>
+				<parameters>
+					<parameter name="buffer" type="char*"/>
+					<parameter name="size" type="int"/>
+					<parameter name="root" type="char*"/>
+					<parameter name="domain" type="char*"/>
+				</parameters>
+			</constructor>
+			<method name="relative_file" symbol="glade_xml_relative_file">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="filename" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="set_common_params" symbol="glade_xml_set_common_params">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="widget" type="GtkWidget*"/>
+					<parameter name="info" type="GladeWidgetInfo*"/>
+				</parameters>
+			</method>
+			<method name="set_packing_property" symbol="glade_xml_set_packing_property">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="parent" type="GtkWidget*"/>
+					<parameter name="child" type="GtkWidget*"/>
+					<parameter name="name" type="char*"/>
+					<parameter name="value" type="char*"/>
+				</parameters>
+			</method>
+			<method name="set_toplevel" symbol="glade_xml_set_toplevel">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="xml" type="GladeXML*"/>
+					<parameter name="window" type="GtkWindow*"/>
+				</parameters>
+			</method>
+			<method name="set_value_from_string" symbol="glade_xml_set_value_from_string">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="xml" type="GladeXML*"/>
+					<parameter name="pspec" type="GParamSpec*"/>
+					<parameter name="string" type="gchar*"/>
+					<parameter name="value" type="GValue*"/>
+				</parameters>
+			</method>
+			<method name="signal_autoconnect" symbol="glade_xml_signal_autoconnect">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+				</parameters>
+			</method>
+			<method name="signal_autoconnect_full" symbol="glade_xml_signal_autoconnect_full">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="func" type="GladeXMLConnectFunc"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="signal_connect" symbol="glade_xml_signal_connect">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="handlername" type="char*"/>
+					<parameter name="func" type="GCallback"/>
+				</parameters>
+			</method>
+			<method name="signal_connect_data" symbol="glade_xml_signal_connect_data">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="handlername" type="char*"/>
+					<parameter name="func" type="GCallback"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<method name="signal_connect_full" symbol="glade_xml_signal_connect_full">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="handler_name" type="gchar*"/>
+					<parameter name="func" type="GladeXMLConnectFunc"/>
+					<parameter name="user_data" type="gpointer"/>
+				</parameters>
+			</method>
+			<vfunc name="lookup_type">
+				<return-type type="GType"/>
+				<parameters>
+					<parameter name="self" type="GladeXML*"/>
+					<parameter name="gtypename" type="char*"/>
+				</parameters>
+			</vfunc>
+			<field name="filename" type="char*"/>
+		</object>
+		<constant name="GLADE_MODULE_API_VERSION" type="int" value="1"/>
+	</namespace>
+</api>
diff --git a/vapi/packages/libglade-2.0/libglade-2.0.gidl b/vapi/packages/libglade-2.0/libglade-2.0.gidl
deleted file mode 100644
index bed020b..0000000
--- a/vapi/packages/libglade-2.0/libglade-2.0.gidl
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-  <!--
-
-        This file was automatically generated.
-        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-
--->
-  <namespace name="Glade">
-    <callback name="GladeApplyCustomPropFunc" type-name="GladeApplyCustomPropFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="xml" type="GladeXML*"/>
-        <parameter name="widget" type="GtkWidget*"/>
-        <parameter name="propname" type="const-gchar*"/>
-        <parameter name="value" type="const-gchar*"/>
-      </parameters>
-    </callback>
-    <callback name="GladeBuildChildrenFunc" type-name="GladeBuildChildrenFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="xml" type="GladeXML*"/>
-        <parameter name="parent" type="GtkWidget*"/>
-        <parameter name="info" type="GladeWidgetInfo*"/>
-      </parameters>
-    </callback>
-    <callback name="GladeFindInternalChildFunc" type-name="GladeFindInternalChildFunc">
-      <return-type type="GtkWidget*"/>
-      <parameters>
-        <parameter name="xml" type="GladeXML*"/>
-        <parameter name="parent" type="GtkWidget*"/>
-        <parameter name="childname" type="const-gchar*"/>
-      </parameters>
-    </callback>
-    <callback name="GladeNewFunc" type-name="GladeNewFunc">
-      <return-type type="GtkWidget*"/>
-      <parameters>
-        <parameter name="xml" type="GladeXML*"/>
-        <parameter name="widget_type" type="GType"/>
-        <parameter name="info" type="GladeWidgetInfo*"/>
-      </parameters>
-    </callback>
-    <callback name="GladeXMLConnectFunc" type-name="GladeXMLConnectFunc">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="handler_name" type="const-gchar*"/>
-        <parameter name="object" type="GObject*"/>
-        <parameter name="signal_name" type="const-gchar*"/>
-        <parameter name="signal_data" type="const-gchar*"/>
-        <parameter name="connect_object" type="GObject*"/>
-        <parameter name="after" type="gboolean"/>
-        <parameter name="user_data" type="gpointer"/>
-      </parameters>
-    </callback>
-    <callback name="GladeXMLCustomWidgetHandler" type-name="GladeXMLCustomWidgetHandler">
-      <return-type type="GtkWidget*"/>
-      <parameters>
-        <parameter name="xml" type="GladeXML*"/>
-        <parameter name="func_name" type="gchar*"/>
-        <parameter name="name" type="gchar*"/>
-        <parameter name="string1" type="gchar*"/>
-        <parameter name="string2" type="gchar*"/>
-        <parameter name="int1" type="gint"/>
-        <parameter name="int2" type="gint"/>
-        <parameter name="user_data" type="gpointer"/>
-      </parameters>
-    </callback>
-    <object get-type="" name="GladeXML" parent="GObject" type-name="GladeXML">
-      <field name="filename" type="char*"/>
-      <field name="priv" type="GladeXMLPrivate*"/>
-      <vfunc name="lookup_type">
-        <return-type type="GType"/>
-        <parameters>
-          <parameter name="arg1" type="GladeXML*self"/>
-          <parameter name="gtypename" type="const-char*"/>
-        </parameters>
-      </vfunc>
-      <method name="build_widget" symbol="glade_xml_build_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="info" type="GladeWidgetInfo*"/>
-        </parameters>
-      </method>
-      <method name="construct" symbol="glade_xml_construct">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="fname" type="const-char*"/>
-          <parameter name="root" type="const-char*"/>
-          <parameter name="domain" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="construct_from_buffer" symbol="glade_xml_construct_from_buffer">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="buffer" type="const-char*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="root" type="const-char*"/>
-          <parameter name="domain" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="ensure_accel" symbol="glade_xml_ensure_accel">
-        <return-type type="GtkAccelGroup*"/>
-        <parameters>
-          <parameter name="xml" type="GladeXML*"/>
-        </parameters>
-      </method>
-      <method name="get_type" symbol="glade_xml_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="get_widget" symbol="glade_xml_get_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="name" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="get_widget_prefix" symbol="glade_xml_get_widget_prefix">
-        <return-type type="GList*"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="name" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="handle_internal_child" symbol="glade_xml_handle_internal_child">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="parent" type="GtkWidget*"/>
-          <parameter name="child_info" type="GladeChildInfo*"/>
-        </parameters>
-      </method>
-      <method name="handle_widget_prop" symbol="glade_xml_handle_widget_prop">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="prop_name" type="const-gchar*"/>
-          <parameter name="value_name" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <constructor name="new" symbol="glade_xml_new">
-        <parameters>
-          <parameter name="fname" type="const-char*"/>
-          <parameter name="root" type="const-char*"/>
-          <parameter name="domain" type="const-char*"/>
-        </parameters>
-      </constructor>
-      <constructor name="new_from_buffer" symbol="glade_xml_new_from_buffer">
-        <parameters>
-          <parameter name="buffer" type="const-char*"/>
-          <parameter name="size" type="int"/>
-          <parameter name="root" type="const-char*"/>
-          <parameter name="domain" type="const-char*"/>
-        </parameters>
-      </constructor>
-      <method name="relative_file" symbol="glade_xml_relative_file">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="filename" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="set_common_params" symbol="glade_xml_set_common_params">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="info" type="GladeWidgetInfo*"/>
-        </parameters>
-      </method>
-      <method name="set_packing_property" symbol="glade_xml_set_packing_property">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="parent" type="GtkWidget*"/>
-          <parameter name="child" type="GtkWidget*"/>
-          <parameter name="name" type="const-char*"/>
-          <parameter name="value" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="set_toplevel" symbol="glade_xml_set_toplevel">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="xml" type="GladeXML*"/>
-          <parameter name="window" type="GtkWindow*"/>
-        </parameters>
-      </method>
-      <method name="set_value_from_string" symbol="glade_xml_set_value_from_string">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="xml" type="GladeXML*"/>
-          <parameter name="pspec" type="GParamSpec*"/>
-          <parameter name="string" type="const-gchar*"/>
-          <parameter name="value" type="GValue*"/>
-        </parameters>
-      </method>
-      <method name="signal_autoconnect" symbol="glade_xml_signal_autoconnect">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-        </parameters>
-      </method>
-      <method name="signal_autoconnect_full" symbol="glade_xml_signal_autoconnect_full">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="func" type="GladeXMLConnectFunc"/>
-          <parameter name="user_data" type="gpointer"/>
-        </parameters>
-      </method>
-      <method name="signal_connect" symbol="glade_xml_signal_connect">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="handlername" type="const-char*"/>
-          <parameter name="func" type="GCallback"/>
-        </parameters>
-      </method>
-      <method name="signal_connect_data" symbol="glade_xml_signal_connect_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="handlername" type="const-char*"/>
-          <parameter name="func" type="GCallback"/>
-          <parameter name="user_data" type="gpointer"/>
-        </parameters>
-      </method>
-      <method name="signal_connect_full" symbol="glade_xml_signal_connect_full">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="handler_name" type="const-gchar*"/>
-          <parameter name="func" type="GladeXMLConnectFunc"/>
-          <parameter name="user_data" type="gpointer"/>
-        </parameters>
-      </method>
-    </object>
-    <struct get-type="" name="GladeAccelInfo" type-name="GladeAccelInfo">
-      <field name="key" readable="1" type="guint" writable="1"/>
-      <field name="modifiers" readable="1" type="GdkModifierType" writable="1"/>
-      <field name="signal" readable="1" type="gchar*" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeAtkActionInfo" type-name="GladeAtkActionInfo">
-      <field name="action_name" readable="1" type="gchar*" writable="1"/>
-      <field name="description" readable="1" type="gchar*" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeAtkRelationInfo" type-name="GladeAtkRelationInfo">
-      <field name="target" readable="1" type="gchar*" writable="1"/>
-      <field name="type" readable="1" type="gchar*" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeChildInfo" type-name="GladeChildInfo">
-      <field name="properties" readable="1" type="GladeProperty*" writable="1"/>
-      <field name="n_properties" readable="1" type="guint" writable="1"/>
-      <field name="child" readable="1" type="GladeWidgetInfo*" writable="1"/>
-      <field name="internal_child" readable="1" type="gchar*" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeInterface" opaque="true" type-name="GladeInterface">
-      <field access="public" name="requires" readable="1" type="gchar**" writable="1" writeable="true"/>
-      <field access="public" name="n_requires" readable="1" type="guint" writable="1" writeable="true"/>
-      <field access="public" name="toplevels" readable="1" type="GladeWidgetInfo**" writable="1" writeable="true"/>
-      <field access="public" name="n_toplevels" readable="1" type="guint" writable="1" writeable="true"/>
-      <field access="public" name="names" readable="1" type="GHashTable*" writable="1" writeable="true"/>
-      <field access="public" name="strings" readable="1" type="GHashTable*" writable="1" writeable="true"/>
-      <method name="destroy" symbol="glade_interface_destroy">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="interface" type="GladeInterface*"/>
-        </parameters>
-      </method>
-      <method name="dump" symbol="glade_interface_dump">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="interface" type="GladeInterface*"/>
-          <parameter name="filename" type="const-gchar*"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct get-type="" name="GladeProperty" type-name="GladeProperty">
-      <field name="name" readable="1" type="gchar*" writable="1"/>
-      <field name="value" readable="1" type="gchar*" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeSignalInfo" type-name="GladeSignalInfo">
-      <field name="name" readable="1" type="gchar*" writable="1"/>
-      <field name="handler" readable="1" type="gchar*" writable="1"/>
-      <field name="object" readable="1" type="gchar*" writable="1"/>
-      <field name="after" readable="1" type="guint" writable="1"/>
-    </struct>
-    <struct get-type="" name="GladeWidgetInfo" type-name="GladeWidgetInfo">
-      <field name="parent" readable="1" type="GladeWidgetInfo*" writable="1"/>
-      <field name="classname" readable="1" type="gchar*" writable="1"/>
-      <field name="name" readable="1" type="gchar*" writable="1"/>
-      <field name="properties" readable="1" type="GladeProperty*" writable="1"/>
-      <field name="n_properties" readable="1" type="guint" writable="1"/>
-      <field name="atk_props" readable="1" type="GladeProperty*" writable="1"/>
-      <field name="n_atk_props" readable="1" type="guint" writable="1"/>
-      <field name="signals" readable="1" type="GladeSignalInfo*" writable="1"/>
-      <field name="n_signals" readable="1" type="guint" writable="1"/>
-      <field name="atk_actions" readable="1" type="GladeAtkActionInfo*" writable="1"/>
-      <field name="n_atk_actions" readable="1" type="guint" writable="1"/>
-      <field name="relations" readable="1" type="GladeAtkRelationInfo*" writable="1"/>
-      <field name="n_relations" readable="1" type="guint" writable="1"/>
-      <field name="accels" readable="1" type="GladeAccelInfo*" writable="1"/>
-      <field name="n_accels" readable="1" type="guint" writable="1"/>
-      <field name="children" readable="1" type="GladeChildInfo*" writable="1"/>
-      <field name="n_children" readable="1" type="guint" writable="1"/>
-    </struct>
-    <function name="enum_from_string" symbol="glade_enum_from_string">
-      <return-type type="gint"/>
-      <parameters>
-        <parameter name="type" type="GType"/>
-        <parameter name="string" type="const-char*"/>
-      </parameters>
-    </function>
-    <function name="flags_from_string" symbol="glade_flags_from_string">
-      <return-type type="guint"/>
-      <parameters>
-        <parameter name="type" type="GType"/>
-        <parameter name="string" type="const-char*"/>
-      </parameters>
-    </function>
-    <function name="get_widget_name" symbol="glade_get_widget_name">
-      <return-type type="const-char*"/>
-      <parameters>
-        <parameter name="widget" type="GtkWidget*"/>
-      </parameters>
-    </function>
-    <function name="get_widget_tree" symbol="glade_get_widget_tree">
-      <return-type type="GladeXML*"/>
-      <parameters>
-        <parameter name="widget" type="GtkWidget*"/>
-      </parameters>
-    </function>
-    <function name="module_check_version" symbol="glade_module_check_version">
-      <return-type type="gchar*"/>
-      <parameters>
-        <parameter name="version" type="gint"/>
-      </parameters>
-    </function>
-    <struct name="GladeParser">
-      <method name="parse_buffer" symbol="glade_parser_parse_buffer">
-        <return-type type="GladeInterface*"/>
-        <parameters>
-          <parameter name="buffer" type="const-gchar*"/>
-          <parameter name="len" type="gint"/>
-          <parameter name="domain" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="parse_file" symbol="glade_parser_parse_file">
-        <return-type type="GladeInterface*"/>
-        <parameters>
-          <parameter name="file" type="const-gchar*"/>
-          <parameter name="domain" type="const-gchar*"/>
-        </parameters>
-      </method>
-    </struct>
-    <function name="register_custom_prop" symbol="glade_register_custom_prop">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="type" type="GType"/>
-        <parameter name="prop_name" type="const-gchar*"/>
-        <parameter name="apply_prop" type="GladeApplyCustomPropFunc"/>
-      </parameters>
-    </function>
-    <function name="register_widget" symbol="glade_register_widget">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="type" type="GType"/>
-        <parameter name="new_func" type="GladeNewFunc"/>
-        <parameter name="build_children" type="GladeBuildChildrenFunc"/>
-        <parameter name="find_internal_child" type="GladeFindInternalChildFunc"/>
-      </parameters>
-    </function>
-    <function name="set_custom_handler" symbol="glade_set_custom_handler">
-      <return-type type="void"/>
-      <parameters>
-        <parameter name="handler" type="GladeXMLCustomWidgetHandler"/>
-        <parameter name="user_data" type="gpointer"/>
-      </parameters>
-    </function>
-    <struct name="GladeStandard">
-      <method name="build_children" symbol="glade_standard_build_children">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="self" type="GladeXML*"/>
-          <parameter name="parent" type="GtkWidget*"/>
-          <parameter name="info" type="GladeWidgetInfo*"/>
-        </parameters>
-      </method>
-      <method name="build_widget" symbol="glade_standard_build_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter name="xml" type="GladeXML*"/>
-          <parameter name="widget_type" type="GType"/>
-          <parameter name="info" type="GladeWidgetInfo*"/>
-        </parameters>
-      </method>
-    </struct>
-  </namespace>
-</api>
-- 
2.7.4