2007-12-03 Li Yuan <li.yuan@sun.com>

        * configure.in, README, NEWS:
        Uprev/release 1.21.3.

2007-12-03  Li Yuan  <li.yuan@sun.com>

        * idl/Accessibility_Collection.idl:
        * libspi/collection.c:
        (impl_getMatchesFrom), (impl_getMatchesTo):
        Fix build error in Solaris, for restrict is a keyword in SS cc.


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

6 files changed, 24 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 032172ad..9fc1ba3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2007-12-03  Li Yuan  <li.yuan@sun.com>
 
+	* configure.in, README, NEWS:
+	Uprev/release 1.21.3.
+
+2007-12-03  Li Yuan  <li.yuan@sun.com>
+
+	* idl/Accessibility_Collection.idl:
+	* libspi/collection.c: 
+	(impl_getMatchesFrom), (impl_getMatchesTo):
+	Fix build error in Solaris, for restrict is a keyword in SS cc.
+
+2007-12-03  Li Yuan  <li.yuan@sun.com>
+
 	* idl/Accessibility_Collection.idl:
 	* libspi/accessible.c: (spi_accessible_construct):
 	* libspi/collection.c: (spi_collection_interface_new),
diff --git a/NEWS b/NEWS
index 641c242a..439f44b9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+What's new in at-spi-1.21.3:
+
+* Bugfixes: #446277, #493547, #326516, #491805, #492469, #490202.
+
 What's new in at-spi-1.21.1:
 
 * Bugfixes: #490205, #490202, #489273.
diff --git a/README b/README
index 809b8225..32cfb032 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 README
 
-at-spi version 1.21.1
+at-spi version 1.21.3
 
 This version of at-spi requires atk 1.17.0 or later.
 
diff --git a/configure.in b/configure.in
index c3956748..f105189b 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_INIT(idl/Accessibility.idl)
 
 AT_SPI_MAJOR_VERSION=1
 AT_SPI_MINOR_VERSION=21
-AT_SPI_MICRO_VERSION=1
+AT_SPI_MICRO_VERSION=3
 AT_SPI_INTERFACE_AGE=0
 AT_SPI_BINARY_AGE=0
 AT_SPI_VERSION="$AT_SPI_MAJOR_VERSION.$AT_SPI_MINOR_VERSION.$AT_SPI_MICRO_VERSION"
diff --git a/idl/Accessibility_Collection.idl b/idl/Accessibility_Collection.idl
index 4af765f8..8a243a73 100644
--- a/idl/Accessibility_Collection.idl
+++ b/idl/Accessibility_Collection.idl
@@ -86,8 +86,8 @@ module Accessibility {
         AccessibleSet getMatchesFrom (in Accessible current_object,
 				       in MatchRule rule, 
                                        in SortOrder sortby, 
-                                       in boolean restrict,
-				       in long count,
+                                       in boolean isrestrict,
+                                       in long count,
                                        in boolean traverse);
 
         Accessible getActiveDescendant ();
diff --git a/libspi/collection.c b/libspi/collection.c
index adb9ed5d..2886e456 100644
--- a/libspi/collection.c
+++ b/libspi/collection.c
@@ -643,7 +643,7 @@ impl_getMatchesFrom (PortableServer_Servant servant,
 		      const Accessibility_Accessible current_object,
 		      const Accessibility_MatchRule rule,
 		      const Accessibility_Collection_SortOrder sortby,
-		      const CORBA_boolean restrict,
+		      const CORBA_boolean isrestrict,
 		      CORBA_long  count,
 		      const CORBA_boolean traverse,
 		      CORBA_Environment *ev){
@@ -657,7 +657,7 @@ impl_getMatchesFrom (PortableServer_Servant servant,
      ls = g_list_append (ls, current_object);
      mrp =  get_collection_from_servant (servant)->_mrp;;
           
-     if (!restrict){
+     if (!isrestrict){
           parent = Accessibility_Accessible__get_parent (current_object, ev);
 	  kount = query_exec (mrp,  sortby, ls, 0, count, parent, index, FALSE, CORBA_OBJECT_NIL, TRUE, traverse, ev);
 
@@ -680,7 +680,7 @@ impl_getMatchesTo (PortableServer_Servant servant,
 		      const Accessibility_Accessible current_object,
 		      const Accessibility_MatchRule rule,
 		      const Accessibility_Collection_SortOrder sortby,
-		      const CORBA_boolean restrict, 
+		      const CORBA_boolean recurse, 
 		      CORBA_long  count,
 		      const CORBA_boolean traverse,
 		      CORBA_Environment *ev){
@@ -697,7 +697,7 @@ impl_getMatchesTo (PortableServer_Servant servant,
   mrp =  get_collection_from_servant (servant)->_mrp;
   
   
-  if (restrict){
+  if (recurse){
     obj = Accessibility_Accessible__get_parent (current_object, ev);
     kount =  query_exec (mrp,  sortby, ls, 0, count,  obj, 0, TRUE, current_object, TRUE, traverse, ev);
   }