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

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

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

        * libspi/accessible.c: (impl_accessibility_accessible_get_state),
        (impl_accessibility_accessible_get_relation_set):
        Fix for #446277. Decrease the ref count to 1.

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

diff --git a/ChangeLog b/ChangeLog
index 2ea39e8..4c4b5fe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-11-12  Li Yuan  <li.yuan@sun.com>
+
+       * configure.in, README, NEWS:
+       Uprev/release 1.21.2.
+
+2007-11-12  Li Yuan  <li.yuan@sun.com>
+
+       * libspi/accessible.c: (impl_accessibility_accessible_get_state),
+       (impl_accessibility_accessible_get_relation_set):
+       Fix for #446277. Decrease the ref count to 1.
+
 2007-10-29  Li Yuan  <li.yuan@sun.com>
 
        * configure.in, README, NEWS:

diff --git a/NEWS b/NEWS
index 641c242..619ba0c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+What's new in at-spi-1.21.2:
+
+* Bugfixes: #446277.
+
 What's new in at-spi-1.21.1:
 
 * Bugfixes: #490205, #490202, #489273.

diff --git a/README b/README
index 809b822..ee617a1 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 README
 
-at-spi version 1.21.1
+at-spi version 1.21.2
 
 This version of at-spi requires atk 1.17.0 or later.
 

diff --git a/configure.in b/configure.in
index c395674..2e2bfda 100644 (file)
--- 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=2
 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/libspi/accessible.c b/libspi/accessible.c
index 671ec66..688d3fd 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -334,12 +334,11 @@ impl_accessibility_accessible_get_state (PortableServer_Servant servant,
   atk_set = atk_object_ref_state_set (object);
   
   set = spi_state_set_new (atk_set);
-  retval = bonobo_object_dup_ref (
+  retval = CORBA_Object_duplicate (
                                  BONOBO_OBJREF(set),
-                                 ev);
+                                 NULL);
 
   g_object_unref (atk_set);
-  Bonobo_Unknown_unref (retval, ev);
 
   return retval;
 }
@@ -372,10 +371,10 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
   for (i = 0; i < n_relations; ++i)
     {
       retval->_buffer[i] =
-        bonobo_object_dup_ref (
+        CORBA_Object_duplicate (
           BONOBO_OBJREF (
             spi_relation_new (atk_relation_set_get_relation (relation_set, i))),
-         ev);
+         NULL);
     }
   
   return retval;