2007-02-26 Li Yuan <li.yuan@sun.com>

        * libspi/accessible.c:
        (impl_accessibility_accessible_get_attributes),
        (impl_accessibility_accessible_get_relation_set):
        Bug #404584 and #401299. Return an empty object instead of return NULL.
        * configure.in, NEWS: Uprev/release 1.17.1.

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

diff --git a/ChangeLog b/ChangeLog
index 1fdbe7a..94df105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-26  Li Yuan <li.yuan@sun.com>
+
+       * libspi/accessible.c:
+       (impl_accessibility_accessible_get_attributes),
+       (impl_accessibility_accessible_get_relation_set):
+       Bug #404584 and #401299. Return an empty object instead of return NULL.
+       * configure.in, NEWS: Uprev/release 1.17.1.
+
 2007-02-20  Kjartan Maraas  <kmaraas@gnome.org>
 
        * Makefile.am: Dist MAINTAINERS.

diff --git a/NEWS b/NEWS
index 1e8a3d1..37250ac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+What's new in at-spi-1.17.1:
+
+* Bugfixes: #404584, #401299, #375319. Fixes some build warnings.
+
 What's new in at-spi-1.17.0:
 
 * Bugfixes: #404592, #400709.

diff --git a/README b/README
index 730fc4a..8bf5a44 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,8 @@
 README
 
-at-spi version 1.17.0
+at-spi version 1.17.1
+
+This version of at-spi requires atk 1.17.0 or later.
 
 *** Welcome to the Gnome Accessibility Project! ***
 

diff --git a/configure.in b/configure.in
index a6cc6df..3f3c74e 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=17        
-AT_SPI_MICRO_VERSION=0
+AT_SPI_MICRO_VERSION=1
 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"
@@ -26,7 +26,7 @@ AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
 dnl required versions of other tools.
-m4_define([req_ver_atk],       [1.12.0])
+m4_define([req_ver_atk],       [1.17.0])
 m4_define([req_ver_gtk],       [2.10.0])
 m4_define([req_ver_gail],      [1.9.0])
 m4_define([req_ver_libbonobo], [1.107.0])

diff --git a/libspi/accessible.c b/libspi/accessible.c
index db19bff..ab9f5bc 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -349,7 +349,7 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
                                                CORBA_Environment     *ev)
 {
   Accessibility_RelationSet *retval;
-  gint n_relations;
+  gint n_relations = 0;
   gint i;
   AtkRelationSet *relation_set;
   AtkObject      *object = get_atkobject_from_servant (servant);
@@ -358,7 +358,8 @@ impl_accessibility_accessible_get_relation_set (PortableServer_Servant servant,
 
   relation_set = atk_object_ref_relation_set (object);
 
-  n_relations = atk_relation_set_get_n_relations (relation_set);
+  if (relation_set)
+    n_relations = atk_relation_set_get_n_relations (relation_set);
 
   retval = CORBA_sequence_Accessibility_Relation__alloc ();
   retval->_length = retval->_maximum = n_relations;
@@ -462,10 +463,8 @@ impl_accessibility_accessible_get_attributes (PortableServer_Servant servant,
     g_return_val_if_fail (object != NULL, NULL);
     attributes = atk_object_get_attributes (object);
 
-    if (attributes == NULL)
-      return NULL;
-
-    n_attributes = g_slist_length (attributes);
+    if (attributes)
+      n_attributes = g_slist_length (attributes);
     
     retval = CORBA_sequence_CORBA_string__alloc ();
     retval->_length = retval->_maximum = n_attributes;