[vala] atk: various improvements, including some regressions fixes

[Evan Nemerson <evann src gnome org>]

commit e284ad66a9ba7c5fd73cf83163d70351fe3845ec
Author: Evan Nemerson <evan coeus-group com>
Date:   Fri Sep 23 13:52:02 2011 -0700

    atk: various improvements, including some regressions fixes

 vapi/atk.vapi                     |   40 ++++++++++++++++++------------------
 vapi/metadata/Atk-1.0-custom.vala |   11 +++++++++-
 vapi/metadata/Atk-1.0.metadata    |    7 +++++-
 3 files changed, 36 insertions(+), 22 deletions(-)
---
diff --git a/vapi/atk.vapi b/vapi/atk.vapi
index a57d93b..801ef46 100644
--- a/vapi/atk.vapi
+++ b/vapi/atk.vapi
@@ -138,14 +138,6 @@ namespace Atk {
 		[NoWrapper]
 		public virtual string get_object_id ();
 	}
-	[CCode (cheader_filename = "atk/atk.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atk_rectangle_get_type ()")]
-	[Compact]
-	public class Rectangle {
-		public int height;
-		public int width;
-		public int x;
-		public int y;
-	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public class Registry : GLib.Object {
 		[Deprecated]
@@ -269,6 +261,7 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_component_get_type ()")]
 	public interface Component : GLib.Object {
+		public abstract uint add_focus_handler (Atk.FocusHandler handler);
 		public abstract bool contains (int x, int y, Atk.CoordType coord_type);
 		public abstract double get_alpha ();
 		public abstract void get_extents (int x, int y, int width, int height, Atk.CoordType coord_type);
@@ -286,19 +279,16 @@ namespace Atk {
 	}
 	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_document_get_type ()")]
 	public interface Document : GLib.Object {
-		public unowned string get_attribute_value (string attribute_name);
+		[CCode (vfunc_name = "get_document_attribute_value")]
+		public virtual unowned string get_attribute_value (string attribute_name);
 		[CCode (vfunc_name = "get_document_attributes")]
 		public virtual unowned GLib.SList<Atk.Attribute?> get_attributes ();
 		public abstract void* get_document ();
-		[NoWrapper]
-		public abstract unowned string get_document_attribute_value (string attribute_name);
-		[NoWrapper]
-		public abstract unowned string get_document_locale ();
 		public abstract unowned string get_document_type ();
-		public unowned string get_locale ();
-		public bool set_attribute_value (string attribute_name, string attribute_value);
-		[NoWrapper]
-		public abstract bool set_document_attribute (string attribute_name, string attribute_value);
+		[CCode (vfunc_name = "get_document_locale")]
+		public virtual unowned string get_locale ();
+		[CCode (vfunc_name = "set_document_attribute")]
+		public virtual bool set_attribute_value (string attribute_name, string attribute_value);
 		public signal void load_complete ();
 		public signal void load_stopped ();
 		public signal void reload ();
@@ -336,9 +326,6 @@ namespace Atk {
 	public interface Implementor : GLib.Object {
 		public abstract unowned Atk.Object ref_accessible ();
 	}
-	[CCode (cheader_filename = "atk/atk.h", lower_case_csuffix = "implementor", type_id = "atk_implementor_get_type ()")]
-	public interface ImplementorIface : GLib.Object {
-	}
 	[CCode (cheader_filename = "atk/atk.h", type_id = "atk_selection_get_type ()")]
 	public interface Selection : GLib.Object {
 		public abstract bool add_selection (int i);
@@ -478,8 +465,21 @@ namespace Atk {
 		public GLib.Value new_value;
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
+	public struct Rectangle {
+		public int x;
+		public int y;
+		public int width;
+		public int height;
+	}
+	[CCode (cheader_filename = "atk/atk.h")]
 	[SimpleType]
 	public struct State : uint64 {
+		[Deprecated (replacement = "StateType.for_name", since = "vala-0.16")]
+		public static Atk.StateType type_for_name (string name);
+		[Deprecated (replacement = "StateType.get_name", since = "vala-0.16")]
+		public static unowned string type_get_name (Atk.StateType type);
+		[Deprecated (replacement = "StateType.register", since = "vala-0.16")]
+		public static Atk.StateType type_register (string name);
 	}
 	[CCode (cheader_filename = "atk/atk.h")]
 	public struct TextRectangle {
diff --git a/vapi/metadata/Atk-1.0-custom.vala b/vapi/metadata/Atk-1.0-custom.vala
index d2d721f..b194222 100644
--- a/vapi/metadata/Atk-1.0-custom.vala
+++ b/vapi/metadata/Atk-1.0-custom.vala
@@ -20,7 +20,16 @@ namespace Atk {
 		public static unowned string type_get_name (Atk.RelationType type);
 		[Deprecated (replacement = "RelationType.register", since = "vala-0.16")]
 		public static Atk.RelationType type_register (string name);
-     }
+	}
+	[SimpleType]
+	public struct State : uint64 {
+		[Deprecated (replacement = "StateType.for_name", since = "vala-0.16")]
+		public static Atk.StateType type_for_name (string name);
+		[Deprecated (replacement = "StateType.get_name", since = "vala-0.16")]
+		public static unowned string type_get_name (Atk.StateType type);
+		[Deprecated (replacement = "StateType.register", since = "vala-0.16")]
+		public static Atk.StateType type_register (string name);
+	}
 	[CCode (copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "atk_text_range_get_type ()", has_destroy_function = false)]
 	[Compact]
 	public class TextRange {
diff --git a/vapi/metadata/Atk-1.0.metadata b/vapi/metadata/Atk-1.0.metadata
index 90fcdd7..de22f0a 100644
--- a/vapi/metadata/Atk-1.0.metadata
+++ b/vapi/metadata/Atk-1.0.metadata
@@ -12,6 +12,7 @@ Text
   .get_run_attributes type="GLib.SList<Attribute?>"
 
 KeyEventStruct.string name="str"
+Rectangle struct
 TextRange.content skip
 Text.get_bounded_ranges skip
 
@@ -41,8 +42,12 @@ _PropertyValues name="PropertyValues"
 _Registry* skip
 
 // Should be fixed upstream
-Implementor skip // g-ir-scanner doesn't realize this is an interface
+Implementor* skip // g-ir-scanner doesn't realize this is an interface
+Component.add_focus_handler skip=false
 Document.get_attributes vfunc_name="get_document_attributes"
+Document.get_attribute_value vfunc_name="get_document_attribute_value"
+Document.get_locale vfunc_name="get_document_locale"
+Document.set_attribute_value vfunc_name="set_document_attribute"
 Object.connect_property_change_handler skip=false
 Relation.get_target type_arguments="Atk.Object"
 Relation.new.targets array array_length_idx=1