[at-spi] Move the new relationship to the end.

[Li Yuan <liyuan src gnome org>]

commit c19f8b9036da256b9db9e179d0a2536d42d9fc6f
Author: Li Yuan <li yuan sun com>
Date:   Mon Nov 9 11:12:17 2009 +0800

    Move the new relationship to the end.

 cspi/spi.h                                 |    4 ++--
 cspi/spi_accessible.c                      |    2 +-
 docs/reference/cspi/tmpl/spi_relation.sgml |    2 +-
 idl/Accessibility_Relation.idl             |    4 ++--
 libspi/relation.c                          |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/cspi/spi.h b/cspi/spi.h
index ef74205..f44f818 100644
--- a/cspi/spi.h
+++ b/cspi/spi.h
@@ -126,7 +126,6 @@ typedef enum
  * SPI_RELATION_MEMBER_OF: Indicates an object is a member of a group of one or
 more target objects.
  * SPI_RELATION_NODE_CHILD_OF: Indicates an object is a cell in a treetable which is displayed because a cell in the same column is expanded and identifies that cell.
- * SPI_RELATION_NODE_PARENT_OF: Indicates an object is a cell in a treetable and is expanded to display other cells in the same column.
  * SPI_RELATION_EXTENDED: This value indicates that a relation other than those pre-specified by this version of AT-SPI
  * is present.
  * SPI_RELATION_FLOWS_TO: Indicates that the object has content that flows logically to another
@@ -143,6 +142,7 @@ more target objects.
  * 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_NODE_PARENT_OF: Indicates an object is a cell in a treetable and is expanded to display other cells in the same column.
  * SPI_RELATION_LAST_DEFINED: Do not use, this is an implementation detail used
  *  to identify the size of this enumeration.
  *
@@ -157,7 +157,6 @@ typedef enum
   SPI_RELATION_CONTROLLED_BY,
   SPI_RELATION_MEMBER_OF,
   SPI_RELATION_NODE_CHILD_OF,
-  SPI_RELATION_NODE_PARENT_OF,
   SPI_RELATION_EXTENDED,
   SPI_RELATION_FLOWS_TO,
   SPI_RELATION_FLOWS_FROM,
@@ -168,6 +167,7 @@ typedef enum
   SPI_RELATION_PARENT_WINDOW_OF,
   SPI_RELATION_DESCRIPTION_FOR,
   SPI_RELATION_DESCRIBED_BY,
+  SPI_RELATION_NODE_PARENT_OF,
   SPI_RELATION_LAST_DEFINED
 } AccessibleRelationType;
 
diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index 573dd45..fda457c 100644
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -1201,7 +1201,6 @@ cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
   relation_type_table [Accessibility_RELATION_MEMBER_OF] = SPI_RELATION_MEMBER_OF;
   relation_type_table [Accessibility_RELATION_TOOLTIP_FOR] = SPI_RELATION_NULL;
   relation_type_table [Accessibility_RELATION_NODE_CHILD_OF] = SPI_RELATION_NODE_CHILD_OF;
-  relation_type_table [Accessibility_RELATION_NODE_PARENT_OF] = SPI_RELATION_NODE_PARENT_OF;
   relation_type_table [Accessibility_RELATION_EXTENDED] = SPI_RELATION_EXTENDED;
   relation_type_table [Accessibility_RELATION_FLOWS_TO] = SPI_RELATION_FLOWS_TO;
   relation_type_table [Accessibility_RELATION_FLOWS_FROM] = SPI_RELATION_FLOWS_FROM;
@@ -1212,6 +1211,7 @@ cspi_init_relation_type_table (AccessibleRelationType *relation_type_table)
   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;
+  relation_type_table [Accessibility_RELATION_NODE_PARENT_OF] = SPI_RELATION_NODE_PARENT_OF;
   return TRUE;
 }
 
diff --git a/docs/reference/cspi/tmpl/spi_relation.sgml b/docs/reference/cspi/tmpl/spi_relation.sgml
index d2d13cf..515a3ca 100644
--- a/docs/reference/cspi/tmpl/spi_relation.sgml
+++ b/docs/reference/cspi/tmpl/spi_relation.sgml
@@ -29,7 +29,6 @@ AccessibleRelations and RelationSets
 @SPI_RELATION_CONTROLLED_BY: 
 @SPI_RELATION_MEMBER_OF: 
 @SPI_RELATION_NODE_CHILD_OF: 
- SPI_RELATION_NODE_PARENT_OF: 
 @SPI_RELATION_EXTENDED: 
 @SPI_RELATION_FLOWS_TO: 
 @SPI_RELATION_FLOWS_FROM: 
@@ -40,6 +39,7 @@ AccessibleRelations and RelationSets
 @SPI_RELATION_PARENT_WINDOW_OF: 
 @SPI_RELATION_DESCRIPTION_FOR: 
 @SPI_RELATION_DESCRIBED_BY: 
+ SPI_RELATION_NODE_PARENT_OF: 
 @SPI_RELATION_LAST_DEFINED: 
 
 <!-- ##### FUNCTION AccessibleRelation_ref ##### -->
diff --git a/idl/Accessibility_Relation.idl b/idl/Accessibility_Relation.idl
index 17f25a5..e1a67be 100644
--- a/idl/Accessibility_Relation.idl
+++ b/idl/Accessibility_Relation.idl
@@ -56,8 +56,6 @@ module Accessibility {
     /** Object is a cell in a treetable which is displayed because a cell in the same column is 
      * expanded and identifies that cell. */
     RELATION_NODE_CHILD_OF,
-    /** Reciprocal of RELATION_NODE_CHILD_OF. */
-    RELATION_NODE_PARENT_OF,
     /** 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.  */
     RELATION_EXTENDED,
@@ -91,6 +89,8 @@ module Accessibility {
     /** Indicates that another object provides descriptive information 
      * about this object; more verbose than RELATION_LABELLED_BY. */
     RELATION_DESCRIBED_BY,
+    /** Reciprocal of RELATION_NODE_CHILD_OF. */
+    RELATION_NODE_PARENT_OF,
     /** 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 9bf1d5d..d71819f 100644
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -43,7 +43,6 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   types[ATK_RELATION_LABELLED_BY] = Accessibility_RELATION_LABELLED_BY;
   types[ATK_RELATION_MEMBER_OF] = Accessibility_RELATION_MEMBER_OF;
   types[ATK_RELATION_NODE_CHILD_OF] = Accessibility_RELATION_NODE_CHILD_OF;
-  types[ATK_RELATION_NODE_PARENT_OF] = Accessibility_RELATION_NODE_PARENT_OF;
   types[ATK_RELATION_FLOWS_TO] = Accessibility_RELATION_FLOWS_TO;
   types[ATK_RELATION_FLOWS_FROM] = Accessibility_RELATION_FLOWS_FROM;
   types[ATK_RELATION_SUBWINDOW_OF] = Accessibility_RELATION_SUBWINDOW_OF;
@@ -53,6 +52,7 @@ spi_init_relation_type_table (Accessibility_RelationType *types)
   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;
+  types[ATK_RELATION_NODE_PARENT_OF] = Accessibility_RELATION_NODE_PARENT_OF;
 
   return TRUE;
 }