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

Conflicts:

	Makefile.am
	atk-adaptor/tree.c
	configure.in
	libspi/Makefile.am
	libspi/accessible.h
	libspi/introspectable.c
	libspi/util.c
	registryd/Makefile.am
	registryd/desktop.c
	registryd/deviceeventcontroller.c
	registryd/deviceeventcontroller.h
	registryd/registry.c
	registryd/registry.h
	spi-common/spi-dbus.c
	xml/Accessibility_Registry.xml
	xml/Makefile.am

diff --cc atk-adaptor/introspectable.c
index 4909e30,6f5819a..44d5eef
--- 1/atk-adaptor/introspectable.c
--- 2/libspi/introspectable.c
+++ b/atk-adaptor/introspectable.c
@@@ -23,8 -23,8 +23,8 @@@
  #include <glib.h>
  #include <accessible.h>
  
- #include "droute/droute.h"
- #include "droute/introspect-loader.h"
 -#include "droute.h"
 -#include "introspect-loader.h"
++#include <droute/droute.h>
++#include <droute/introspect-loader.h>
  
  /*
   * This file contains an implementation of the D-Bus introspectable interface.

diff --cc atk-adaptor/tree.c
Simple merge

diff --cc registryd/deviceeventcontroller.c
index 24969f5,5e04c84..f5d6fb6
--- 1/registryd/deviceeventcontroller.c
--- 2/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@@ -53,14 -52,9 +53,15 @@@
  #include <gdk/gdkkeysyms.h>
  #include <gdk/gdkwindow.h>
  
 -#include "../libspi/spi-private.h"
 +#include <atk-adaptor/spi-private.h>
 +#include <atk-adaptor/keymasks.h>
 +#include <droute/droute.h>
 +#include <spi-common/spi-dbus.h>
 +#include <spi-common/spi-types.h>
 +
  #include "deviceeventcontroller.h"
 +#include "reentrant-list.h"
+ #include "libspi/keymasks.h"
  
  KeySym ucs2keysym (long ucs);
  long keysym2ucs(KeySym keysym); 

diff --cc registryd/registry.c
index 3dc13d6,9455e1f..92b481f
--- 1/registryd/registry.c
--- 2/registryd/registry.c
+++ b/registryd/registry.c
@@@ -39,6 -38,7 +39,10 @@@
  
  /* Our parent GObject type  */
  #define PARENT_TYPE G_OBJECT_TYPE
++<<<<<<< HEAD:registryd/registry.c
++=======
+ 
++>>>>>>> 6d509d490749c6bac3149a5ec45862352ffcf290:registryd/registry.c
  
  int _dbg = 0;
  

diff --cc xml/Makefile.am
index 22eb2b5,ba3c9c6..64b9207
--- 1/xml/Makefile.am
--- 2/xml/Makefile.am
+++ b/xml/Makefile.am
@@@ -1,30 -1,38 +1,41 @@@
- XML= \
+ XML_SPEC= \
        Accessibility.xml \
-       Accessibility_Accessible.xml \
-       Accessibility_Action.xml \
-       Accessibility_Application.xml \
-       Accessibility_Component.xml \
-       Accessibility_Document.xml \
-       Accessibility_EditableText.xml \
-       Accessibility_Event.xml \
-       Accessibility_Hyperlink.xml \
-       Accessibility_Hypertext.xml \
-       Accessibility_Image.xml \
-       Accessibility_LoginHelper.xml \
-       Accessibility_Registry.xml \
+       org.freedesktop.atspi.Accessible.xml \
+       org.freedesktop.atspi.Action.xml \
+       org.freedesktop.atspi.Application.xml \
+       org.freedesktop.atspi.Component.xml \
+       org.freedesktop.atspi.Document.xml \
+       org.freedesktop.atspi.EditableText.xml \
+       org.freedesktop.atspi.Hyperlink.xml \
+       org.freedesktop.atspi.Hypertext.xml \
+       org.freedesktop.atspi.Image.xml \
+       org.freedesktop.atspi.LoginHelper.xml \
+       Accessibility_Registry_Common.xml \
+       org.freedesktop.atspi.Registry.xml \
+       org.freedesktop.atspi.DeviceEventController.xml \
+       org.freedesktop.atspi.DeviceEventListener.xml \
        Accessibility_Role.xml \
-       Accessibility_Selection.xml \
-       Accessibility_Selector.xml \
+       org.freedesktop.atspi.Selection.xml \
+       org.freedesktop.atspi.Selector.xml \
        Accessibility_State.xml \
-       Accessibility_StreamableContent.xml \
-       Accessibility_Table.xml \
-       Accessibility_Text.xml \
-       Accessibility_Value.xml
+       org.freedesktop.atspi.StreamableContent.xml \
+       org.freedesktop.atspi.Table.xml \
+       org.freedesktop.atspi.Text.xml \
+       org.freedesktop.atspi.Tree.xml \
+       org.freedesktop.atspi.Value.xml
  
- spec.xml: $(XML)
+ spec.xml: $(XML_SPEC)
 -      xsltproc --xinclude ../tools/identity.xsl $< >$@
 +      xsltproc --xinclude $(top_srcdir)/tools/identity.xsl $< >$@
  
- EXTRA_DIST = $(XML)
+ EXTRA_DIST = $(XML_SPEC)
  
 +BUILT_SOURCES = spec.xml
 +CLEANFILES = spec.xml
++
+ INTROSPECT_FILES = $(addprefix introspection/,$(patsubst %.xml,%,$(filter org.freedesktop.atspi%,$(XML_SPEC))))
+ 
+ $(INTROSPECT_FILES): introspection/%: %.xml ../tools/spec-to-introspect.xsl
+       xsltproc ../tools/spec-to-introspect.xsl $< |sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' >$@
+ 
+ introspectdir = $(pkgdatadir)/dbus
+ dist_introspect_DATA = $(INTROSPECT_FILES)