From: liyuan <liyuan@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Wed, 19 Mar 2008 09:05:36 +0000 (+0000)
Subject: 2008-03-19  Li Yuan  <li.yuan@sun.com>
X-Git-Tag: AT_SPI2_ATK_0_1_3~309
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8df3e0b27fa0d4f38c1d1f75f128e0c5f2bb4b33;p=platform%2Fupstream%2Fat-spi2-atk.git

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 a92a26a..3cd9300 100644
--- 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 fdc912b..3965e87 100644
--- 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);