2008-03-19 Li Yuan <li.yuan@sun.com>

        * libspi/document.c: (impl_getAttributes):
        Bug #451553. Return NULL is there are no attributes. Patch from Ginn
        Chen.

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

diff --git a/ChangeLog b/ChangeLog
index a92a26a8aba555ac0855300e70fb0992b1b932a7..3cd9300ff032558c33998d86d4979d7b5634a434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-19  Li Yuan  <li.yuan@sun.com>
+
+       * libspi/document.c: (impl_getAttributes):
+       Bug #451553. Return NULL is there are no attributes. Patch from Ginn
+       Chen.
+
 2008-03-19  Li Yuan  <li.yuan@sun.com>
 
        * atk-bridge/bridge.c: (spi_atk_emit_eventv):

diff --git a/libspi/document.c b/libspi/document.c
index fdc912b0698c1862828c1b81339a6dfd871f275b..3965e87716f2c5b08c88339d3d49ba0f6346143c 100644 (file)
--- a/libspi/document.c
+++ b/libspi/document.c
@@ -105,10 +105,9 @@ impl_getAttributes (PortableServer_Servant servant,
   g_return_val_if_fail (document != NULL, NULL);
   
   attributes = atk_document_get_attributes (document);
-  
-  bonobo_return_val_if_fail (attributes != NULL, NULL, ev);
 
-  bonobo_return_val_if_fail (attributes != NULL, NULL, ev);
+  if (!attributes)
+    return NULL;  
 
   /* according to atkobject.h, AtkAttributeSet is a GSList */
   n_attributes = g_slist_length (attributes);