Bugfix in AccessibleComponent_getExtents ().

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_event.c

diff --git a/cspi/spi_event.c b/cspi/spi_event.c
index bc8a355..c1adea8 100644 (file)
--- a/cspi/spi_event.c
+++ b/cspi/spi_event.c
@@ -21,11 +21,11 @@
  */
 
 #include <cspi/spi-private.h>
-#include <cspi/spi-listener-impl.h>
 
 /**
  * createAccessibleEventListener:
  * @callback : an #AccessibleEventListenerCB callback function, or NULL.
+ * @user_data: a pointer to data which will be passed to the callback when invoked.
  *
  * Create a new #AccessibleEventListener with a specified (in-process) callback function.
  *
@@ -33,12 +33,13 @@
  *
  **/
 AccessibleEventListener *
-createAccessibleEventListener (AccessibleEventListenerCB callback)
+createAccessibleEventListener (AccessibleEventListenerCB callback,
+                              void                     *user_data)
 {
   AccessibleEventListener *listener = cspi_event_listener_new ();
   if (callback)
     {
-      AccessibleEventListener_addCallback (listener, callback);
+      AccessibleEventListener_addCallback (listener, callback, user_data);
     }
   return listener;
 }
@@ -47,6 +48,7 @@ createAccessibleEventListener (AccessibleEventListenerCB callback)
  * AccessibleEventListener_addCallback:
  * @listener: the #AccessibleEventListener instance to modify.
  * @callback: an #AccessibleEventListenerCB function pointer.
+ * @user_data: a pointer to data which will be passed to the callback when invoked.
  *
  * Add an in-process callback function to an existing AccessibleEventListener.
  * Note that the callback function must live in the same address
@@ -60,13 +62,26 @@ createAccessibleEventListener (AccessibleEventListenerCB callback)
  **/
 SPIBoolean
 AccessibleEventListener_addCallback (AccessibleEventListener *listener,
-                                    AccessibleEventListenerCB callback)
+                                    AccessibleEventListenerCB callback,
+                                    void                     *user_data)
 {
-  cspi_event_listener_add_callback (listener, callback);
+  cspi_event_listener_add_cb (listener, callback, user_data);
   return TRUE;
 }
 
 /**
+ * AccessibleEventListener_unref:
+ * @listener: a pointer to the #AccessibleEventListener being operated on.
+ *
+ * Decrements an #AccessibleEventListener's reference count.
+ **/
+void
+AccessibleEventListener_unref (AccessibleEventListener *listener)
+{
+  cspi_event_listener_unref (listener);
+}
+
+/**
  * AccessibleEventListener_removeCallback:
  * @listener: the #AccessibleEventListener instance to modify.
  * @callback: an #AccessibleEventListenerCB function pointer.
@@ -80,13 +95,14 @@ SPIBoolean
 AccessibleEventListener_removeCallback (AccessibleEventListener  *listener,
                                        AccessibleEventListenerCB callback)
 {
-  cspi_event_listener_remove_callback (listener, callback);
+  cspi_event_listener_remove_cb (listener, callback);
   return TRUE;
 }
 
 /**
  * createAccessibleKeystrokeListener:
  * @callback : an #AccessibleKeystrokeListenerCB callback function, or NULL.
+ * @user_data: a pointer to data which will be passed to the callback when invoked.
  *
  * Create a new #AccessibleKeystrokeListener with a specified callback function.
  *
@@ -94,20 +110,22 @@ AccessibleEventListener_removeCallback (AccessibleEventListener  *listener,
  *
  **/
 AccessibleKeystrokeListener *
-createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB callback)
+createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB callback,
+                                  void                         *user_data)
 {
-  CSpiKeystrokeListener *listener = cspi_keystroke_listener_new ();
+  AccessibleKeystrokeListener *listener = cspi_keystroke_listener_new ();
   if (callback)
     {
-      AccessibleKeystrokeListener_addCallback (listener, callback);
+      AccessibleKeystrokeListener_addCallback (listener, callback, user_data);
     }
-  return (AccessibleKeystrokeListener *)listener;
+  return listener;
 }
 
 /**
  * AccessibleKeystrokeListener_addCallback:
  * @listener: the #AccessibleKeystrokeListener instance to modify.
  * @callback: an #AccessibleKeystrokeListenerCB function pointer.
+ * @user_data: a pointer to data which will be passed to the callback when invoked.
  *
  * Add an in-process callback function to an existing #AccessibleKeystrokeListener.
  *
@@ -116,9 +134,10 @@ createAccessibleKeystrokeListener (AccessibleKeystrokeListenerCB callback)
  **/
 SPIBoolean
 AccessibleKeystrokeListener_addCallback (AccessibleKeystrokeListener *listener,
-                                        AccessibleKeystrokeListenerCB callback)
+                                        AccessibleKeystrokeListenerCB callback,
+                                        void                         *user_data)
 {
-  cspi_keystroke_listener_add_callback (listener, callback);
+  cspi_keystroke_listener_add_cb (listener, callback, user_data);
   return TRUE;
 }
 
@@ -136,19 +155,18 @@ SPIBoolean
 AccessibleKeystrokeListener_removeCallback (AccessibleKeystrokeListener *listener,
                                            AccessibleKeystrokeListenerCB callback)
 {
-  cspi_keystroke_listener_remove_callback (listener, callback);
+  cspi_keystroke_listener_remove_cb (listener, callback);
   return TRUE;
 }
 
-
 /**
  * AccessibleKeystrokeListener_unref:
  * @listener: a pointer to the #AccessibleKeystrokeListener being operated on.
  *
  * Decrements an #AccessibleKeystrokeListener's reference count.
  **/
-void AccessibleKeystrokeListener_unref (AccessibleKeystrokeListener *listener)
+void
+AccessibleKeystrokeListener_unref (AccessibleKeystrokeListener *listener)
 {
-  /* Would prefer this not to be bonobo api */
-  bonobo_object_unref (BONOBO_OBJECT (listener));
+  cspi_keystroke_listener_unref (listener);
 }