2009-06-08 Mark Doffman <mark.doffman@codethink.co.uk>

        Merge activation changes by Li Yuan.

diff --cc configure.ac
index 0295491,70f7525..c79e58d
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -124,6 -161,22 +138,16 @@@ if test -z "$DEFAULT_ATSPI_INTROSPECTIO
          DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
  fi
  
 -AC_ARG_VAR([GTK_MODULE_DIR],
 -         [Where to place the atk-adaptor gtk module])
 -if test -z "$GTK_MODULE_DIR"; then
 -        GTK_MODULE_DIR=gtk-2.0/modules
 -fi
 -
+ AC_ARG_WITH(dbus-services,
+            [AC_HELP_STRING([--with-dbus-services=<dir>],
+            [where D-BUS services directory is])])
+ if ! test -z "$with_dbus_services" ; then
+            DBUS_SERVICES_DIR="$with_dbus_services"
+ else
+            DBUS_SERVICES_DIR="$datadir/dbus-1/services"
+ fi
+ AC_SUBST(DBUS_SERVICES_DIR)
+ 
  dnl find sizes & alignments
  orig_CPPFLAGS=$CPPFLAGS
  CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
@@@ -140,16 -193,30 +164,17 @@@ CPPFLAGS=$orig_CPPFLAG
  AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
  
  AC_CONFIG_FILES([Makefile
 -               libloginhelper-1.0.pc
 -               cspi-1.0.pc
 -               cspi-1.0-uninstalled.pc
 +                 pkgconfig/dbind-0.1.pc
 +                 pkgconfig/dbind-0.1-uninstalled.pc
 +                 pkgconfig/droute-0.1.pc
 +                 pkgconfig/droute-0.1-uninstalled.pc
 +                 pkgconfig/Makefile
                 xml/Makefile
 -               tests/Makefile
                 tools/Makefile
                 droute/Makefile
 -               spi-common/Makefile
                 registryd/Makefile
 -               atk-adaptor/Makefile
 -               login-helper/Makefile
 -               tests/dummyatk/Makefile
 -               tests/data/Makefile
 -               tests/pyatspi/Makefile
 -               tests/pyatspi/pasytest/Makefile
 -               tests/apps/Makefile
 -               tests/cspi/Makefile
+                registryd/at-spi-registryd.desktop.in
                 dbind/Makefile
 -               cspi/Makefile
 -               pyatspi/Makefile
 -               dbind-config.h])
 +               dbind/dbind-config.h])
  
  AC_OUTPUT

diff --cc dbind/Makefile.am
Simple merge

diff --cc registryd/Makefile.am
Simple merge

diff --cc registryd/deviceeventcontroller.c
index 55f2eeb,0f3e158..41ae97e
--- 1/registryd/deviceeventcontroller.c
--- 2/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@@ -51,15 -51,13 +51,14 @@@
  #include <gdk/gdk.h>
  #include <gdk/gdkx.h> /* TODO: hide dependency (wrap in single porting file) */
  #include <gdk/gdkkeysyms.h>
- #include <gdk/gdkwindow.h>
  
 -#include <spi-common/keymasks.h>
 -#include <spi-common/spi-dbus.h>
 -#include <spi-common/spi-types.h>
 -
  #include <droute/droute.h>
  
 +#include "paths.h"
 +#include "keymasks.h"
 +#include "de-types.h"
 +#include "de-marshaller.h"
 +
  #include "deviceeventcontroller.h"
  #include "reentrant-list.h"
  

diff --cc registryd/keymasks.h
index 215bef2,8bf09d1..6dc95ad
--- 1/registryd/keymasks.h
--- 2/spi-common/keymasks.h
+++ b/registryd/keymasks.h
@@@ -21,11 -21,11 +21,11 @@@
   * Boston, MA 02111-1307, USA.
   */
  
 -#ifndef _SPI_KEYMASKS_H_
 -#define _SPI_KEYMASKS_H_
 +#ifndef SPI_KEYMASKS_H_
 +#define SPI_KEYMASKS_H_
  
  #include <X11/Xlib.h>
- #include <glib/gmacros.h>
+ #include <glib.h>
  
  G_BEGIN_DECLS
  

diff --cc registryd/registry-main.c
index 64cfe52,da9e91a..8429df3
--- 1/registryd/registry-main.c
--- 2/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@@ -24,11 -24,11 +24,11 @@@
  #include <stdlib.h>
  #include <config.h>
  #include <string.h>
- #include <glib/gmain.h>
+ #include <glib.h>
  
 -#include <spi-common/spi-dbus.h>
  #include <droute/droute.h>
  
 +#include "paths.h"
  #include "registry.h"
  #include "deviceeventcontroller.h"