* cspi/spi_event.c

(cspi_internal_event_get_object): Use CORBA_TypeCode_Equivalent()
to compare two CORBA_TypeCodes.
(cspi_internal_event_add): Silence warning from FORTE compiler.

* cspi/bonobo/cspi_bonobo-listener.h: Add function declarations to
avoid implicit declaration of functions.

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

diff --git a/ChangeLog b/ChangeLog
index 6dce62d..dc33a17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-10  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * cspi/spi_event.c 
+       (cspi_internal_event_get_object): Use CORBA_TypeCode_Equivalent() 
+       to compare two CORBA_TypeCodes.
+       (cspi_internal_event_add): Silence warning from FORTE compiler.
+
+       * cspi/bonobo/cspi_bonobo-listener.h: Add function declarations to 
+       avoid implicit declaration of functions.
+       
 2002-12-09  Padraig O'Briain  <padraig.obriain@sun.com>
 
        * atk-bridge/bridge.c:
@@ -69,7 +79,6 @@
        (spi_dec_button_update_and_emit): 
        Fixed type in mask bit operations; fix for #99799.
        
->>>>>>> 1.266
 2002-12-02  Bill Haneman  <bill.haneman@sun.com>
 
        Removed some of the more dangerous workarounds from

diff --git a/cspi/bonobo/cspi-bonobo-listener.h b/cspi/bonobo/cspi-bonobo-listener.h
index 8dbcf9e..08d74b7 100644 (file)
--- a/cspi/bonobo/cspi-bonobo-listener.h
+++ b/cspi/bonobo/cspi-bonobo-listener.h
@@ -58,6 +58,13 @@ typedef SpiDeviceListenerClass CSpiDeviceListenerClass;
 
 GType cspi_device_listener_get_type (void);
 gpointer cspi_device_listener_new (void);
+void cspi_device_listener_add_cb (AccessibleDeviceListener  *al,
+                                  AccessibleDeviceListenerCB callback,
+                                  void                      *user_data);
+void cspi_device_listener_remove_cb (AccessibleDeviceListener  *al,
+                                     AccessibleDeviceListenerCB callback);
+void cspi_device_listener_unref (AccessibleDeviceListener *listener);
+
 
 G_END_DECLS
 

diff --git a/cspi/spi_event.c b/cspi/spi_event.c
index 577f8e6..97515fd 100644 (file)
--- a/cspi/spi_event.c
+++ b/cspi/spi_event.c
@@ -358,7 +358,7 @@ cspi_internal_event_get_object (const InternalEvent *e)
   g_return_val_if_fail (e, NULL);
   g_return_val_if_fail (e->data, NULL);
   any = (CORBA_any *) e->data;
-  if (any->_type == TC_CORBA_Object) 
+  if (CORBA_TypeCode_equal (any->_type, TC_CORBA_Object, cspi_ev()))
     return cspi_object_take (* (CORBA_Object *) any->_value);
   else 
     return NULL;
@@ -535,7 +535,7 @@ cspi_internal_event_check (const AccessibleEvent *e)
 static InternalEvent *
 cspi_internal_event_add (const InternalEvent *e)
 {
-  _cspi_event_queue = g_slist_prepend (_cspi_event_queue, e);
+  _cspi_event_queue = g_slist_prepend (_cspi_event_queue, (gpointer) e);
   return (InternalEvent *) e;
 }