Added relations DESCRIPTION_FOR and DESCRIBED_BY (from ATK).

Bug #344264.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@812 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 9e18721ff67735ae764c84fd4c6d0286834cf267..c0b0e0235828d0b1109233cfe4a4231ca1d72c61 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,7 +15,14 @@
        * cspi/spi-roletypes.h, spi_accessible.c: Added marshalling 
        definitions/conversions for new roles from ATK.
 
-       * libspi/accessible.c: Fixed marshalling of new role types from ATK.
+       * idl/Accessibility_Relation.idl:
+       * libspi/relation.c:
+       * cspi/spi.h, spi_accessible.c: Added SPI_RELATION_DESCRIBED_BY and 
+       SPI_RELATION_DESCRIPTION_FOR.  (bug #344264) Also
+       SPI_PARENT_WINDOW_OF, which was in ATK but not AT-SPI.
+
+       * libspi/accessible.c: Fixed marshalling of new role types from
+       ATK.
        
 2006-04-17  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/cspi/spi.h b/cspi/spi.h
index 994efa22b257e1b8caa5040ae74358c4ece79fd0..559db3bc07e7b8ffc8be81598b2496c0e3b014af 100644 (file)
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -115,8 +115,9 @@ more target objects.
  *  another's content.
  *@SPI_RELATION_EMBEDDED_BY: Inverse of %SPI_RELATION_EMBEDS, indicates that
  *  this object's content is visualy embedded in another object.
- *@SPI_RELATION_POPUP_FOR: Indicates that an object is a popup for another objec
-t.
+ *@SPI_RELATION_POPUP_FOR: Indicates that an object is a popup for another objec *@SPI_RELATION_PARENT_WINDOW_OF: Indicates that an object is a parent window of another object.
+ *@SPI_RELATION_DESCRIBED_BY: Indicates that another object provides descriptive information about this object; more verbose than %SPI_RELATION_LABELLED_BY.
+ *@SPI_RELATION_DESCRIPTION_FOR: Indicates that an object provides descriptive information about another object; more verbose than %SPI_RELATION_LABEL_FOR.
  *@SPI_RELATION_LAST_DEFINED: Do not use, this is an implementation detail used
  *  to identify the size of this enumeration.
  *
@@ -138,6 +139,9 @@ typedef enum
   SPI_RELATION_EMBEDS,
   SPI_RELATION_EMBEDDED_BY,
   SPI_RELATION_POPUP_FOR,
+  SPI_RELATION_PARENT_WINDOW_OF,
+  SPI_RELATION_DESCRIPTION_FOR,
+  SPI_RELATION_DESCRIBED_BY,
   SPI_RELATION_LAST_DEFINED
 } AccessibleRelationType;
 

diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index 8673b3148460bd12fbc010022b2d1a5876a3ab6d..ab80b9e85df2b2d64dc74454d765d1454e722491 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -1108,6 +1108,9 @@ cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
   relation_type_table [Accessibility_RELATION_EMBEDS] = SPI_RELATION_EMBEDS;
   relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY;
   relation_type_table [Accessibility_RELATION_POPUP_FOR] = SPI_RELATION_POPUP_FOR;
+  relation_type_table [Accessibility_RELATION_PARENT_WINDOW_OF] = SPI_RELATION_PARENT_WINDOW_OF;
+  relation_type_table [Accessibility_RELATION_DESCRIBED_BY] = SPI_RELATION_DESCRIBED_BY;
+  relation_type_table [Accessibility_RELATION_DESCRIPTION_FOR] = SPI_RELATION_DESCRIPTION_FOR;
   return TRUE;
 }
 

diff --git a/docs/reference/cspi/tmpl/spi_relation.sgml b/docs/reference/cspi/tmpl/spi_relation.sgml
index f56be7169d29141fcd2462c5447fd61d61bdc117..9d81c1a107f0f5ece717ac29f238fa129af52636 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_relation.sgml
+++ b/docs/reference/cspi/tmpl/spi_relation.sgml
@@ -36,6 +36,9 @@ AccessibleRelations and RelationSets
 @SPI_RELATION_EMBEDS: 
 @SPI_RELATION_EMBEDDED_BY: 
 @SPI_RELATION_POPUP_FOR: 
+@SPI_RELATION_PARENT_WINDOW_OF: 
+@SPI_RELATION_DESCRIPTION_FOR: 
+@SPI_RELATION_DESCRIBED_BY: 
 @SPI_RELATION_LAST_DEFINED: 
 
 <!-- ##### FUNCTION AccessibleRelation_ref ##### -->

diff --git a/idl/Accessibility_Relation.idl b/idl/Accessibility_Relation.idl
index b6f2911b7b845c9aed26bc419577a43eb4eee5a8..1f81b487b7d8f4396ca081a294842fbd88811d1d 100644 (file)
--- a/idl/Accessibility_Relation.idl
+++ b/idl/Accessibility_Relation.idl
@@ -82,6 +82,12 @@ module Accessibility {
     RELATION_POPUP_FOR,
     /** This is the reciprocal relation to RELATION_POPUP_FOR. */
     RELATION_PARENT_WINDOW_OF,
+    /** Indicates that an object provides descriptive information 
+     * about another object; more verbose than RELATION_LABEL_FOR. */
+    RELATION_DESCRIPTION_FOR, 
+    /** Indicates that another object provides descriptive information 
+     * about this object; more verbose than RELATION_LABELLED_BY. */
+    RELATION_DESCRIBED_BY,
     /** Do not use as a parameter value, used to determine the size of the enumeration. */
     RELATION_LAST_DEFINED
   };

diff --git a/libspi/relation.c b/libspi/relation.c
index 62b238d5d27c8a66939acf34fed0ddd29e71497f..6d487d4a424fc8e89750080976536c8f7a42ead9 100644 (file)
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -50,6 +50,9 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   types[ATK_RELATION_EMBEDDED_BY] = Accessibility_RELATION_EMBEDDED_BY;
   types[ATK_RELATION_POPUP_FOR] = Accessibility_RELATION_POPUP_FOR;
   types[ATK_RELATION_PARENT_WINDOW_OF] = Accessibility_RELATION_PARENT_WINDOW_OF;
+  types[ATK_RELATION_DESCRIPTION_FOR] = Accessibility_RELATION_DESCRIPTION_FOR;
+  types[ATK_RELATION_DESCRIBED_BY] = Accessibility_RELATION_DESCRIBED_BY;
+
   return TRUE;
 }