Bugfixes and uprev of configure.in, release at-spi-1.7.11.

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

diff --git a/ChangeLog b/ChangeLog
index 3104a8e..50fb703 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
        Patch from Ginn Chen, assign detail1 in children-changed
        so that the child object can be assigned to the Any when the
        at-spi event is emitted.  Bug #350552.
+
+       * libspi/application.c:
+       (spi_application_finalize): Remove g_print debug output.
+       Bug #350958.
        
 2006-08-21  Bill Haneman <bill.haneman@sun.com>
 

diff --git a/NEWS b/NEWS
index 4017591..ac68a4e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+What's new in at-spi-1.7.11:
+
+* Docs fixes.
+
+* Fixed getAttributes APIs.
+
+* Export Hyperlink interface for AtkHyperlinkImpl peers.
+
+* Aggregate Document interface.
+
 What's new in at-spi-1.7.10:
 
 * New method Selection::deselectChild.  RFE #326535.

diff --git a/README b/README
index 85a7bf8..dd0109f 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 README
 
-at-spi version 1.7.10
+at-spi version 1.7.11
 
 *** Welcome to the Gnome Accessibility Project! ***
 

diff --git a/configure.in b/configure.in
index d62c61c..f16d94f 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=7
-AT_SPI_MICRO_VERSION=10
+AT_SPI_MICRO_VERSION=11
 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 a5e29d5..d26784c 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -632,6 +632,16 @@ spi_accessible_construct (GType type, AtkObject *o)
        bonobo_object_add_interface (bonobo_object (retval),
                                     BONOBO_OBJECT (spi_document_interface_new (o)));
       }
+    if (ATK_IS_HYPERLINK_IMPL (o))
+      {
+         /* !!! the cast below is used instead of the ATK_HYPERLINK macro, since 
+          the object 'o' is not really a hyperlink, but is in fact an AtkHyperlinkImpl.
+          Ouch.  This works since it gets cast back to GObject, but it's nasty and needs
+          to be cleaned up.
+         */
+       bonobo_object_add_interface (bonobo_object (retval),
+                                    BONOBO_OBJECT (spi_hyperlink_new ((AtkHyperlink*)o)));
+      }
 
     return retval;
 }

diff --git a/libspi/application.c b/libspi/application.c
index a0cfb58..fba42cf 100644 (file)
--- a/libspi/application.c
+++ b/libspi/application.c
@@ -67,7 +67,6 @@ spi_accessible_application_finalize (GObject *object)
   g_list_free (application->toolkit_listeners);
   application->toolkit_listeners = NULL;
 
-  g_print ("application finalize called\n");
   (G_OBJECT_CLASS (spi_application_parent_class))->finalize (object);
 }
 

diff --git a/libspi/document.c b/libspi/document.c
index dc496ff..fdc912b 100644 (file)
--- a/libspi/document.c
+++ b/libspi/document.c
@@ -91,7 +91,7 @@ impl_getAttributeValue (PortableServer_Servant servant,
 }
 
 
-static CORBA_string
+static Accessibility_AttributeSet*
 impl_getAttributes (PortableServer_Servant servant,
                    CORBA_Environment *ev){
   
@@ -102,7 +102,7 @@ impl_getAttributes (PortableServer_Servant servant,
   gint n_attributes = 0;
   gint i;
   
-  g_return_val_if_fail (document != NULL, CORBA_string_dup (""));
+  g_return_val_if_fail (document != NULL, NULL);
   
   attributes = atk_document_get_attributes (document);
   

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 2a504af..6d6bf5d 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -109,8 +109,13 @@ spi_hyperlink_new (AtkHyperlink *object)
        * it will be cast back to a G_OBJECT inside spi_action_interface_new
        * before use, so this is OK though very ropey coding style.
        */
-      bonobo_object_add_interface (bonobo_object (new_hyperlink),
-                                  BONOBO_OBJECT (spi_action_interface_new ((AtkObject *) object)));
+
+       /* Don't aggregate action twice... if this is from AtkHyperlinkImpl */
+       if (!bonobo_object_query_interface (bonobo_object (new_hyperlink), "IDL:Accessibility/Action:1.0",
+                                           NULL))
+           
+           bonobo_object_add_interface (bonobo_object (new_hyperlink),
+                                        BONOBO_OBJECT (spi_action_interface_new ((AtkObject *) object)));
     }
   return new_hyperlink;
 }
@@ -121,8 +126,16 @@ get_hyperlink_from_servant (PortableServer_Servant servant)
   SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
 
   g_return_val_if_fail (object != NULL, NULL);
-  g_return_val_if_fail (ATK_IS_HYPERLINK(object->gobj), NULL);
-  return ATK_HYPERLINK (object->gobj);
+  if (ATK_IS_HYPERLINK(object->gobj)) 
+  {
+      return ATK_HYPERLINK (object->gobj);
+  }
+  else if (ATK_IS_HYPERLINK_IMPL(object->gobj))
+  {
+      return atk_hyperlink_impl_get_hyperlink (ATK_HYPERLINK_IMPL (object->gobj));
+  }
+  else
+      return NULL;
 }
 
 

diff --git a/libspi/hyperlink.h b/libspi/hyperlink.h
index eef7898..73bd659 100644 (file)
--- a/libspi/hyperlink.h
+++ b/libspi/hyperlink.h
@@ -26,6 +26,7 @@
 
 #include <libspi/base.h>
 #include <atk/atkhyperlink.h>
+#include <atk/atkhyperlinkimpl.h>
 
 G_BEGIN_DECLS