From a1f0ee7a1c9e605f2ab9ae47f1e7aad29a38b183 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@novell.com>
Date: Fri, 6 Nov 2009 14:41:53 -0500
Subject: [PATCH 1/1] API changes for out--of-process accessibles, and support
 ParentOf

Modified DBus api to return bus names along with object paths to support
out-of-process children.
Also, support the new ParentOf relationship.
---
 xml/org.freedesktop.atspi.Accessible.xml |  8 ++++----
 xml/org.freedesktop.atspi.Component.xml  |  2 +-
 xml/org.freedesktop.atspi.Relation.xml   | 29 +++++++++++++++++------------
 xml/org.freedesktop.atspi.Table.xml      | 10 +++++-----
 xml/org.freedesktop.atspi.Tree.xml       | 10 +++++-----
 5 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/xml/org.freedesktop.atspi.Accessible.xml b/xml/org.freedesktop.atspi.Accessible.xml
index 5c3c25f..b8a2cbe 100644
--- a/xml/org.freedesktop.atspi.Accessible.xml
+++ b/xml/org.freedesktop.atspi.Accessible.xml
@@ -94,7 +94,7 @@
     A string describing the object in more detail than name.
   </tp:docstring>
   </tp:property>
-  <tp:property name="parent" type="o" access="read">
+  <tp:property name="parent" type="(so)" access="read">
   <tp:docstring>
     The Accessible object which is this object's containing object.
   </tp:docstring>
@@ -113,7 +113,7 @@
       an in parameter indicating which child is requested (zero-indexed).
     </tp:docstring>
     </arg>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="(so)" tp:type="Accessible">
     <tp:docstring>
       the 'nth' ::Accessible child of this object.
     </tp:docstring>
@@ -133,7 +133,7 @@
     <tp:docstring>
       Get a set defining this object's relationship to other accessible objects.
     </tp:docstring>
-    <arg direction="out" type="a(uao)" tp:type="RelationSet">
+    <arg direction="out" type="a(ua(so))" tp:type="RelationSet">
     <tp:docstring>
       A RelationSet defining this object's relationships.
     </tp:docstring>
@@ -228,7 +228,7 @@
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Get the containing Application for this object.</p>
     </tp:docstring>
-    <arg direction="out" type="o" tp:type="Application">
+    <arg direction="out" type="(so)" tp:type="Application">
     <tp:docstring>
       The Application instance to which this object belongs.
     </tp:docstring>
diff --git a/xml/org.freedesktop.atspi.Component.xml b/xml/org.freedesktop.atspi.Component.xml
index df75d59..90a7e69 100644
--- a/xml/org.freedesktop.atspi.Component.xml
+++ b/xml/org.freedesktop.atspi.Component.xml
@@ -107,7 +107,7 @@
     <arg direction="in" name="x" type="i"/>
     <arg direction="in" name="y" type="i"/>
     <arg direction="in" name="coord_type" type="u" tp:type="COORD_TYPE"/>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="(so)" tp:type="Accessible">
     <tp:docstring>
       The Accessible child whose bounding box contains the specified point. 
     </tp:docstring>
diff --git a/xml/org.freedesktop.atspi.Relation.xml b/xml/org.freedesktop.atspi.Relation.xml
index 792899c..6eafa54 100644
--- a/xml/org.freedesktop.atspi.Relation.xml
+++ b/xml/org.freedesktop.atspi.Relation.xml
@@ -51,46 +51,51 @@
   </tp:enumvalue>
   <tp:enumvalue suffix="RELATION_NODE_CHILD_OF" value="7">
   <tp:docstring>
-    Reserved for future use. 
+    Object is a child of the target.
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_EXTENDED" value="8">
+  <tp:enumvalue suffix="RELATION_NODE_PARENT_OF" value="8">
+  <tp:docstring>
+    Object is a parent of the target.
+  </tp:docstring>
+  </tp:enumvalue>
+  <tp:enumvalue suffix="RELATION_EXTENDED" value="9">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Used to indicate that a relationship exists, but its type is not specified in the enumeration
       and must be obtained via a call to getRelationTypeName.  </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_FLOWS_TO" value="9">
+  <tp:enumvalue suffix="RELATION_FLOWS_TO" value="10">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Object renders content which flows logically to another object.  
       For instance, text in a paragraph may flow to another object which is not the 
       'next sibling' in the accessibility hierarchy. </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_FLOWS_FROM" value="10">
+  <tp:enumvalue suffix="RELATION_FLOWS_FROM" value="11">
   <tp:docstring>
     Reciprocal of RELATION_FLOWS_TO. 
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_SUBWINDOW_OF" value="11">
+  <tp:enumvalue suffix="RELATION_SUBWINDOW_OF" value="12">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Object is visually and semantically considered a subwindow of another object, even though
       it is not the object's child.  Useful when dealing with embedded applications and other cases
       where the widget hierarchy does not map cleanly to the onscreen presentation.  </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_EMBEDS" value="12">
+  <tp:enumvalue suffix="RELATION_EMBEDS" value="13">
   <tp:docstring>
     Similar to SUBWINDOW_OF, but specifically used for cross-process embedding.  
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_EMBEDDED_BY" value="13">
+  <tp:enumvalue suffix="RELATION_EMBEDDED_BY" value="14">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Reciprocal of RELATION_EMBEDS; Used to denote content rendered by embedded renderers that
       live in a separate process space from the embedding context.  </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_POPUP_FOR" value="14">
+  <tp:enumvalue suffix="RELATION_POPUP_FOR" value="15">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Denotes that the object is a transient window or frame associated with another onscreen object.
       Similar to TOOLTIP_FOR, but more general.  Useful for windows which are technically 
@@ -100,24 +105,24 @@
       the previous toplevel ROLE_FRAME object may still be the active window.  </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_PARENT_WINDOW_OF" value="15">
+  <tp:enumvalue suffix="RELATION_PARENT_WINDOW_OF" value="16">
   <tp:docstring>
     This is the reciprocal relation to RELATION_POPUP_FOR. 
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_DESCRIPTION_FOR" value="16">
+  <tp:enumvalue suffix="RELATION_DESCRIPTION_FOR" value="17">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Indicates that an object provides descriptive information 
       about another object; more verbose than RELATION_LABEL_FOR. </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_DESCRIBED_BY" value="17">
+  <tp:enumvalue suffix="RELATION_DESCRIBED_BY" value="18">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>Indicates that another object provides descriptive information 
       about this object; more verbose than RELATION_LABELLED_BY. </p>
   </tp:docstring>
   </tp:enumvalue>
-  <tp:enumvalue suffix="RELATION_LAST_DEFINED" value="18">
+  <tp:enumvalue suffix="RELATION_LAST_DEFINED" value="19">
   <tp:docstring>
     Do not use as a parameter value, used to determine the size of the enumeration. 
   </tp:docstring>
diff --git a/xml/org.freedesktop.atspi.Table.xml b/xml/org.freedesktop.atspi.Table.xml
index 5f8ac81..02722c6 100644
--- a/xml/org.freedesktop.atspi.Table.xml
+++ b/xml/org.freedesktop.atspi.Table.xml
@@ -30,12 +30,12 @@
       viewport are included. </p>
   </tp:docstring>
   </tp:property>
-  <tp:property name="caption" type="o" access="read">
+  <tp:property name="caption" type="(so)" access="read">
   <tp:docstring>
     An Accessible which represents of a caption for a Table.
   </tp:docstring>
   </tp:property>
-  <tp:property name="summary" type="o" access="read">
+  <tp:property name="summary" type="(so)" access="read">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>An accessible object which summarizes the contents of a Table.
       This object is frequently itself a Table instance, albeit a simplified one.</p>
@@ -71,7 +71,7 @@
       The specified table column, zero-indexed.
     </tp:docstring>
     </arg>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="(so)" tp:type="Accessible">
     <tp:docstring>
       An Accessible object representing the specified table cell.
     </tp:docstring>
@@ -215,7 +215,7 @@
       The specified table row, zero-indexed.
     </tp:docstring>
     </arg>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="(so)" tp:type="Accessible">
     <tp:docstring>
       An Accessible representatin of the specified table row, if available.
     </tp:docstring>
@@ -232,7 +232,7 @@
       The specified table column, zero-indexed.
     </tp:docstring>
     </arg>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="(so)" tp:type="Accessible">
     <tp:docstring>
       An Accessible representatin of the specified table column, if available.
     </tp:docstring>
diff --git a/xml/org.freedesktop.atspi.Tree.xml b/xml/org.freedesktop.atspi.Tree.xml
index 458cdf4..d0d4c7a 100644
--- a/xml/org.freedesktop.atspi.Tree.xml
+++ b/xml/org.freedesktop.atspi.Tree.xml
@@ -11,13 +11,13 @@
 			</tp:docstring>
   		</tp:member>
 	
-		<tp:member type="o" tp:name="parent">
+		<tp:member type="(so)" tp:name="parent">
 			<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-				<p>D-Bus path of the parent accessible.</p>
+				<p>D-Bus name and path of the parent accessible.</p>
 			</tp:docstring>
   		</tp:member>
 		
-		<tp:member type="ao" tp:name="children">
+		<tp:member type="a(so)" tp:name="children">
 			<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
 				<p>Array of all the child accessibles.</p>
 			</tp:docstring>
@@ -81,7 +81,7 @@
 				application. This should be used to create
 				a mirror of the tree of Accessibles within the AT.</p>
 			</tp:docstring>
-			<arg name="nodes" type="a(ooaoassusau)" direction="out" tp:type="AccessibleProxy[]">
+			<arg name="nodes" type="a(o(so)a(so)assusau)" direction="out" tp:type="AccessibleProxy[]">
 				<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
 					<p>Array of Accessible Object proxy structures.</p>
 				</tp:docstring>
@@ -94,7 +94,7 @@
 				accessible objects that have changed since the last
 				updateTree signal was send</p>
 			</tp:docstring>
-			<arg name="nodesAdded" type="(ooaoassusau)" tp:type="AccessibleProxy[]">
+			<arg name="nodesAdded" type="((so)(so)a(so)assusau)" tp:type="AccessibleProxy[]">
 				<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
 					<p>Array of Accessible Object proxy structures to be added.</p>
 				</tp:docstring>
-- 
2.7.4