2009-02-19 Mark Doffman <mark.doffman@codethink.co.uk>

        * configure.ac
          libspi-1.0*
          Remove libspi package config. No libspi remains.

        * atk-adaptor/*
          Add extra debug. Dont initialize if no root
          accessible available

diff --git a/Makefile.am b/Makefile.am
index e40a69d..3312c7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,9 @@
 SUBDIRS=xml tools dbind droute spi-common atk-adaptor registryd cspi pyatspi login-helper tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 SUBDIRS=xml tools dbind droute spi-common atk-adaptor registryd cspi pyatspi login-helper tests
 
 pkgconfigdir = $(libdir)/pkgconfig

-pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
+pkgconfig_DATA = cspi-1.0.pc libloginhelper-1.0.pc

 
 EXTRA_DIST = \
        cspi-1.0.pc.in \
        cspi-1.0-uninstalled.pc.in \
        libloginhelper-1.0.pc.in \
 
 EXTRA_DIST = \
        cspi-1.0.pc.in \
        cspi-1.0-uninstalled.pc.in \
        libloginhelper-1.0.pc.in \

-       libspi-1.0.pc.in \
-       libspi-1.0-uninstalled.pc.in

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 3595f3e..494763b 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -270,6 +270,8 @@ register_subtree (AtkObject *accessible)
   GQueue    *traversal;
   GQueue    *emit_update;
 
   GQueue    *traversal;
   GQueue    *emit_update;
 

+  g_return_if_fail (ATK_IS_OBJECT (accessible));
+

   traversal = g_queue_new ();
   emit_update = g_queue_new ();
 
   traversal = g_queue_new ();
   emit_update = g_queue_new ();
 

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index f5dc9de..6fab38e 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -238,10 +238,14 @@ adaptor_init (gint *argc, gchar **argv[])
   GError *err = NULL;
   DBusError error;
   DBusConnection *bus;
   GError *err = NULL;
   DBusError error;
   DBusConnection *bus;

+  AtkObject *root;

   gchar *introspection_directory;
 
   DRoutePath *treepath, *accpath;
 
   gchar *introspection_directory;
 
   DRoutePath *treepath, *accpath;
 

+  root = atk_get_root ();
+  g_return_val_if_fail (root, 0);
+

   /* Parse command line options */
   opt = g_option_context_new(NULL);
   g_option_context_add_main_entries(opt, atspi_option_entries, NULL);
   /* Parse command line options */
   opt = g_option_context_new(NULL);
   g_option_context_add_main_entries(opt, atspi_option_entries, NULL);


@@ -252,9 +256,7 @@ adaptor_init (gint *argc, gchar **argv[])
   /* Allocate global data and do ATK initializations */
   atk_adaptor_app_data = g_new0 (SpiAppData, 1);
   atk_misc = atk_misc_get_instance ();
   /* Allocate global data and do ATK initializations */
   atk_adaptor_app_data = g_new0 (SpiAppData, 1);
   atk_misc = atk_misc_get_instance ();

-  atk_adaptor_app_data->root = atk_get_root();
-  if (!atk_adaptor_app_data->root)
-      g_warning("AT-SPI Root accessible is NULL");
+  atk_adaptor_app_data->root = root;

 
   /* Set up D-Bus connection and register bus name */
   dbus_error_init (&error);
 
   /* Set up D-Bus connection and register bus name */
   dbus_error_init (&error);

diff --git a/configure.ac b/configure.ac
index 8320c40..84046b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -176,8 +176,6 @@ LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
 AC_CONFIG_FILES([Makefile
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
 AC_CONFIG_FILES([Makefile

-                libspi-1.0.pc
-                libspi-1.0-uninstalled.pc

                 libloginhelper-1.0.pc
                 cspi-1.0.pc
                 cspi-1.0-uninstalled.pc
                 libloginhelper-1.0.pc
                 cspi-1.0.pc
                 cspi-1.0-uninstalled.pc

diff --git a/libspi-1.0-uninstalled.pc.in b/libspi-1.0-uninstalled.pc.in
deleted file mode 100644 (file)
index d8f4d69..0000000
--- a/libspi-1.0-uninstalled.pc.in
+++ /dev/null
@@ -1,8 +0,0 @@
-idldir=${pc_top_builddir}/${pcfiledir}/idl
-
-Name: libspi
-Description: Accessibility Technology software library
-Requires: libbonobo-2.0 atk
-Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/libspi/libspi.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}

diff --git a/libspi-1.0.pc.in b/libspi-1.0.pc.in
deleted file mode 100644 (file)
index c7c407a..0000000
--- a/libspi-1.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libspi
-Description: Accessibility Technology software library
-Requires: libbonobo-2.0 atk
-Version: @VERSION@
-Libs: -L${libdir} -lspi
-Cflags: -I${includedir}/at-spi-1.0