From: Mike Gorse <mgorse@boston.site>
Date: Tue, 13 May 2008 20:52:09 +0000 (-0400)
Subject: Merge branch 'mdoff' of ssh://git.codethink.co.uk/git/atspi-dbus into mgorse
X-Git-Tag: AT_SPI2_CORE_0_1_3~247^2~6^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e879a45ddc5f82a93b2be5dcc00b8d6640d37b42;p=platform%2Fupstream%2Fat-spi2-core.git

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

Conflicts:

	libspi/Makefile.am
---

e879a45ddc5f82a93b2be5dcc00b8d6640d37b42
diff --cc libspi/Makefile.am
index 1b2b2c0,b0a8045..5ba1b47
--- a/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/dbus.c
index b95cad2,922a93a..2263a6d
--- a/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)
  {