Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse

Conflicts:

	libspi/Makefile.am

diff --cc atk-bridge/bridge.c
Simple merge

diff --cc libspi/Makefile.am
index 1b2b2c0,b0a8045..5ba1b47
--- 1/libspi/Makefile.am
--- 2/libspi/Makefile.am
+++ b/libspi/Makefile.am
@@@ -18,7 -19,9 +19,8 @@@ libspiinclude_HEADERS =               
        Accessibility.h         \
        accessible.h \
        bitarray.h \
-       droute.h
 -      dbus.h \
+       droute.h \
+       introspect-loader.h
  
  BUILT_SOURCES = Accessibility.h
  CLEANFILES = Accessibility.h
@@@ -39,9 -42,10 +41,11 @@@ libspi_la_SOURCES =         
        selection.c             \
        table.c                 \
        text.c                  \
-       tree.c \
+       tree.c                  \
 +      util.c \
-       value.c
+       value.c                 \
+       introspect-loader.c     \
+       introspectable.c 
  
  Accessibility.h: ../xml/spec.xml ../tools/c-constants-generator.xsl
        xsltproc --stringparam mixed-case-prefix Accessibility_ ../tools/c-constants-generator.xsl $< >$@

diff --cc libspi/accessible.h
Simple merge

diff --cc libspi/dbus.c
index b95cad2,922a93a..2263a6d
--- 1/libspi/dbus.c
--- 2/libspi/dbus.c
+++ b/libspi/dbus.c
@@@ -182,24 -183,11 +182,24 @@@ spi_dbus_initialize (DRouteData * data
    spi_initialize_image (data);
    spi_initialize_selection (data);
    spi_initialize_table (data);
-   spi_initialize_tree (data);
    spi_initialize_text (data);
    spi_initialize_value (data);
+   spi_initialize_introspectable(data);
  }
  
 +void spi_dbus_emit_valist(DBusConnection *bus, const char *path, const char *interface, const char *name, int first_arg_type, va_list args)
 +{
 +  DBusMessage *sig;
 +
 +  sig = dbus_message_new_signal(path, interface, name);
 +  if (first_arg_type != DBUS_TYPE_INVALID)
 +  {
 +    dbus_message_append_args_valist(sig, first_arg_type, args);
 +  }
 +  dbus_connection_send(bus, sig, NULL);
 +  dbus_message_unref(sig);
 +}
 +
  static GString *
  spi_get_tree (AtkObject * obj, GString * str, DRouteData * data)
  {