Make AtspiEventListenerCb not call for a const datum

[platform/upstream/at-spi2-core.git] / atspi / atspi-device-listener.c

diff --git a/atspi/atspi-device-listener.c b/atspi/atspi-device-listener.c
index 58a6d6a..3ac4451 100644 (file)
--- a/atspi/atspi-device-listener.c
+++ b/atspi/atspi-device-listener.c
@@ -115,7 +115,7 @@ id_is_free (guint id)
 }
 
 static AtspiDeviceEvent *
-atspi_device_event_copy (AtspiDeviceEvent *src)
+atspi_device_event_copy (const AtspiDeviceEvent *src)
 {
   AtspiDeviceEvent *dst = g_new0 (AtspiDeviceEvent, 1);
   dst->type = src->type;
@@ -164,14 +164,12 @@ atspi_device_event_dispatch (AtspiDeviceListener               *listener,
 static void
 atspi_device_listener_init (AtspiDeviceListener *listener)
 {
-  GList *new_list;
 
   do
   {
     listener->id = listener_id++;
   } while (!id_is_free (listener->id));
-  new_list = g_list_append (device_listeners, listener);
-  if (new_list) device_listeners = new_list;
+  device_listeners = g_list_append (device_listeners, listener);
 }
 
 static void
@@ -232,7 +230,7 @@ atspi_device_listener_new (AtspiDeviceListenerCB callback,
 }
 
 /**
- * atspi_device_listener_new_simple:
+ * atspi_device_listener_new_simple: (skip)
  * @callback: (scope notified): an #AtspiDeviceListenerCB callback function,
  *            or NULL.
  * @callback_destroyed: A #GDestroyNotify called when the listener is freed
@@ -249,7 +247,7 @@ AtspiDeviceListener *
 atspi_device_listener_new_simple (AtspiDeviceListenerSimpleCB callback,
                            GDestroyNotify callback_destroyed)
 {
-  return atspi_device_listener_new (device_remove_datum, callback_destroyed, callback);
+  return atspi_device_listener_new (device_remove_datum, callback, callback_destroyed);
 }
 
 /**
@@ -278,13 +276,7 @@ atspi_device_listener_add_callback (AtspiDeviceListener  *listener,
   new_handler = device_event_handler_new (callback,
                                           callback_destroyed, user_data);
 
-  if (new_handler)
-  {
-    GList *new_list;
-    new_list = g_list_prepend (listener->callbacks, new_handler);
-    if (new_list)
-      listener->callbacks = new_list;
-  }
+  listener->callbacks = g_list_prepend (listener->callbacks, new_handler);
 }
 
 /**