Have spi_initialize_introspectable take a verify function

diff --git a/libspi/accessible.h b/libspi/accessible.h
index d36b6ee..1d5a72e 100644 (file)
--- a/libspi/accessible.h
+++ b/libspi/accessible.h
@@ -45,7 +45,7 @@ void spi_initialize_selection(DRouteData *data);
 void spi_initialize_table(DRouteData *data);
 void spi_initialize_text(DRouteData *data);
 void spi_initialize_value(DRouteData *data);
-void spi_initialize_introspectable(DRouteData *data);
+void spi_initialize_introspectable(DRouteData *data, DRouteGetDatumFunction verify_object);
 
 void spi_register_tree_object(DBusConnection *bus, const char *path);
 

diff --git a/libspi/dbus.c b/libspi/dbus.c
index 2263a6d..7152b66 100644 (file)
--- a/libspi/dbus.c
+++ b/libspi/dbus.c
@@ -184,7 +184,7 @@ spi_dbus_initialize (DRouteData * data)
   spi_initialize_table (data);
   spi_initialize_text (data);
   spi_initialize_value (data);
-  spi_initialize_introspectable(data);
+  spi_initialize_introspectable(data, (DRouteGetDatumFunction) spi_dbus_get_object);
 }
 
 void spi_dbus_emit_valist(DBusConnection *bus, const char *path, const char *interface, const char *name, int first_arg_type, va_list args)

diff --git a/libspi/introspectable.c b/libspi/introspectable.c
index 3ce29c3..6f5819a 100644 (file)
--- a/libspi/introspectable.c
+++ b/libspi/introspectable.c
@@ -112,9 +112,9 @@ static DRouteMethod methods[] = {
  * Adds the introspectable interface to the DRoute object provided
  */
 void
-spi_initialize_introspectable (DRouteData *data)
+spi_initialize_introspectable (DRouteData *data, DRouteGetDatumFunction verify_object)
 {
   droute_add_interface (data, "org.freedesktop.atspi.Introspectable",
                        methods, NULL,
-                       (DRouteGetDatumFunction) spi_dbus_get_path, NULL);
+                       verify_object, NULL);
 };