Fixed crash during deregistering applications.
[platform/upstream/at-spi2-core.git] / registryd / registry.c
index 9455e1f..15bc7a9 100644 (file)
@@ -2,6 +2,7 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
+ * Copyright 2008, 2010 Codethink Ltd.
  * Copyright 2001, 2002 Sun Microsystems Inc.,
  * Copyright 2001, 2002 Ximian, Inc.
  *
  * Boston, MA 02111-1307, USA.
  */
 
-/* registry.c: the main accessibility service registry implementation */
-
-#undef SPI_LISTENER_DEBUG
-#undef SPI_DEBUG
-#undef SPI_QUEUE_DEBUG
-
 #include <config.h>
-#ifdef SPI_DEBUG
-#  include <stdio.h>
-#endif
+#include <string.h>
+#include <ctype.h>
 
-#include "../libspi/spi-private.h"
+#include "paths.h"
 #include "registry.h"
-#include "dbus/dbus-glib-lowlevel.h"
+#include "introspection.h"
+
+typedef struct event_data event_data;
+struct event_data
+{
+  gchar *bus_name;
+  gchar **data;
+  GSList *properties;
+};
+
+static void
+children_added_listener (DBusConnection * bus,
+                         gint             index,
+                         const gchar    * name,
+                         const gchar    * path);
+
+static void
+children_removed_listener (DBusConnection * bus,
+                           gint             index,
+                           const gchar    * name,
+                           const gchar    * path);
+
+/*---------------------------------------------------------------------------*/
 
-/* Our parent GObject type  */
-#define PARENT_TYPE G_OBJECT_TYPE
+typedef struct _SpiReference
+{
+  gchar *name;
+  gchar *path;
+} SpiReference;
+
+static SpiReference *
+spi_reference_new (const gchar *name, const gchar *path)
+{
+  SpiReference *ref;
 
+  ref = g_new0 (SpiReference, 1);
+  ref->name = g_strdup (name);
+  ref->path = g_strdup (path);
 
-int _dbg = 0;
+  return ref;
+}
 
-typedef enum {
-  ETYPE_FOCUS,
-  ETYPE_OBJECT,
-  ETYPE_PROPERTY,
-  ETYPE_WINDOW,
-  ETYPE_TOOLKIT,
-  ETYPE_KEYBOARD,
-  ETYPE_MOUSE,
-  ETYPE_LAST_DEFINED
-} EventTypeCategory;
+static void
+spi_reference_free (SpiReference *ref)
+{
+  g_free (ref->name);
+  g_free (ref->path);
+  g_free (ref);
+}
 
-typedef struct {
-  const char *event_name;
-  EventTypeCategory type_cat;
-  GQuark major;  /* from string segment[1] */
-  GQuark minor;  /* from string segment[1]+segment[2] */
-  GQuark detail; /* from string segment[3] (not concatenated) */
-} EventTypeStruct;
+/*---------------------------------------------------------------------------*/
 
 G_DEFINE_TYPE(SpiRegistry, spi_registry, G_TYPE_OBJECT)
 
 static void
-spi_registry_set_debug (const char *debug_flag_string)
+spi_registry_class_init (SpiRegistryClass *klass)
+{
+  spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT);
+}
+
+static void
+spi_registry_init (SpiRegistry *registry)
 {
-  if (debug_flag_string) 
-    _dbg = (int) g_ascii_strtod (debug_flag_string, NULL);
+  registry->apps = g_ptr_array_new_with_free_func ((GDestroyNotify) spi_reference_free);
 }
 
-static void emit(SpiRegistry *registry, const char *name, int first_type, ...)
+/*---------------------------------------------------------------------------*/
+
+static dbus_bool_t
+return_v_string (DBusMessageIter * iter, const gchar * str)
 {
-  va_list arg;
+  DBusMessageIter variant;
 
-  va_start(arg, first_type);
-  spi_dbus_emit_valist(registry->droute.bus, SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_REGISTRY, name, first_type, arg);
-  va_end(arg);
+  if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "s",
+                                    &variant))
+    return FALSE;
+    dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str);
+  dbus_message_iter_close_container (iter, &variant);
+  return TRUE;
+}
+
+static dbus_bool_t
+append_reference (DBusMessageIter * iter, const char * name, const char * path)
+{
+  DBusMessageIter iter_struct;
+
+  if (!dbus_message_iter_open_container (iter, DBUS_TYPE_STRUCT, NULL,
+                                    &iter_struct))
+    return FALSE;
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name);
+  dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_OBJECT_PATH, &path);
+  dbus_message_iter_close_container (iter, &iter_struct);
+  return TRUE;
+}
+
+/*---------------------------------------------------------------------------*/
+
+static gboolean
+compare_reference (SpiReference *one, SpiReference *two)
+{
+  if (g_strcmp0 (one->name, two->name) == 0 &&
+      g_strcmp0 (one->path, two->path) == 0)
+    return TRUE;
+  else
+    return FALSE;
+}
+
+static gboolean
+find_index_of_reference (GPtrArray *arr, const gchar *name, const gchar * path, guint *index)
+{
+  SpiReference *ref;
+  gboolean found = FALSE;
+  guint i = 0;
+
+  ref = spi_reference_new (name, path);
+
+  for (i = 0; i < arr->len; i++)
+    {
+      if (compare_reference (ref, g_ptr_array_index (arr, i)));
+        {
+          found = TRUE;
+          break;
+        }
+    }
+
+  spi_reference_free (ref);
+
+  *index = i;
+  return found;
 }
 
 static void
-desktop_add_application (SpiDesktop *desktop,
-                        guint index, gpointer data)
+add_application (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const gchar *path)
 {
-  SpiRegistry *registry = SPI_REGISTRY (data);
-  const char *name = g_list_nth_data(desktop->applications, index);
-  
-  emit(registry, "ApplicationAdd", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+  g_ptr_array_add (reg->apps, spi_reference_new (name, path));
+  children_added_listener (bus, reg->apps->len - 1, name, path);
 }
 
+static void
+set_id (SpiRegistry *reg, DBusConnection *bus, const gchar *name, const gchar *path)
+{
+  DBusMessage *message;
+  DBusMessageIter iter, iter_variant;
+  const char *iface_application = "org.a11y.atspi.Application";
+  const char *id = "Id";
 
+  message = dbus_message_new_method_call (name, path,
+                                          DBUS_INTERFACE_PROPERTIES, "Set");
+  if (!message)
+    return;
+  dbus_message_iter_init_append (message, &iter);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &iface_application);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &id);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "i", &iter_variant);
+  dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &reg->id);
+  /* TODO: This will cause problems if we cycle through 2^31 ids */
+  reg->id++;
+  dbus_message_iter_close_container (&iter, &iter_variant);
+  dbus_connection_send (bus, message, NULL);
+  dbus_message_unref (message);
+}
 
 static void
-desktop_remove_application (SpiDesktop *desktop,
-                           guint index, gpointer data)
+remove_application (SpiRegistry *reg, DBusConnection *bus, guint index)
 {
-  SpiRegistry *registry = SPI_REGISTRY (data);
-  const char *name = g_list_nth_data(desktop->applications, index);
-  
-  emit(registry, "ApplicationRemove", DBUS_TYPE_UINT32, &index, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
+  SpiReference *ref = g_ptr_array_index (reg->apps, index);
+
+  spi_remove_device_listeners (reg->dec, ref->name);
+  children_removed_listener (bus, index, ref->name, ref->path);
+  g_ptr_array_remove_index (reg->apps, index);
 }
 
+static gboolean
+event_is_subtype (gchar **needle, gchar **haystack)
+{
+  while (*haystack && **haystack)
+    {
+      if (g_strcmp0 (*needle, *haystack))
+        return FALSE;
+      needle++;
+      haystack++;
+    }
+  return TRUE;
+}
+
+static gboolean
+needs_mouse_poll (char **event)
+{
+  if (g_strcmp0 (event [0], "Mouse") != 0)
+    return FALSE;
+  if (!event [1] || !event [1][0])
+    return TRUE;
+  return (g_strcmp0 (event [1], "Abs") == 0);
+}
+
+static void
+remove_events (SpiRegistry *registry, const char *bus_name, const char *event)
+{
+  gchar **remove_data;
+  GList *list;
+  gboolean mouse_found = FALSE;
+  DBusMessage *signal;
+
+  remove_data = g_strsplit (event, ":", 3);
+  if (!remove_data)
+    {
+      return;
+    }
+
+  for (list = registry->events; list;)
+    {
+      event_data *evdata = list->data;
+      list = list->next;
+      if (!g_strcmp0 (evdata->bus_name, bus_name) &&
+          event_is_subtype (evdata->data, remove_data))
+        {
+          g_strfreev (evdata->data);
+          g_free (evdata->bus_name);
+          g_slist_free_full (evdata->properties, g_free);
+          g_free (evdata);
+          registry->events = g_list_remove (registry->events, evdata);
+        }
+      else
+        {
+          if (needs_mouse_poll (evdata->data))
+            mouse_found = TRUE;
+        }
+    }
+
+  if (!mouse_found)
+    spi_device_event_controller_stop_poll_mouse ();
+
+  g_strfreev (remove_data);
+
+  signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
+                                    SPI_DBUS_INTERFACE_REGISTRY,
+                                    "EventListenerDeregistered");
+  dbus_message_append_args (signal, DBUS_TYPE_STRING, &bus_name,
+                            DBUS_TYPE_STRING, &event, DBUS_TYPE_INVALID);
+  dbus_connection_send (registry->bus, signal, NULL);
+  dbus_message_unref (signal);
+}
 
 static void
-spi_registry_object_finalize (GObject *object)
+handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-  DBG (1, g_warning ("spi_registry_object_finalize called\n"));
-  g_object_unref (SPI_REGISTRY (object)->de_controller);
+  char *name, *old, *new;
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
 
-  G_OBJECT_CLASS (spi_registry_parent_class)->finalize (object);
+  if (dbus_message_get_args (message, NULL,
+                             DBUS_TYPE_STRING, &name,
+                             DBUS_TYPE_STRING, &old,
+                             DBUS_TYPE_STRING, &new,
+                             DBUS_TYPE_INVALID))
+    {
+      if (*old != '\0' && *new == '\0')
+        {
+          /* Remove all children with the application name the same as the disconnected application. */
+          guint i;
+          for (i = 0; i < reg->apps->len; i++)
+            {
+              SpiReference *ref  = g_ptr_array_index (reg->apps, i);
+              if (!g_strcmp0 (old, ref->name))
+                {
+                  remove_application (reg, bus, i);
+                  i--;
+                }
+            } 
+
+          remove_events (reg, old, "");
+        }
+    }
 }
 
-/**
- * registerApplication:
- * @application: a reference to the requesting @Application
- * return values: void
- *
- * Register a new application with the accessibility broker.
- *
- **/
+/*
+ * Converts names of the form "active-descendant-changed" to
+ *" ActiveDescendantChanged"
+ */
+static gchar *
+ensure_proper_format (const char *name)
+{
+  gchar *ret = (gchar *) g_malloc (strlen (name) * 2 + 2);
+  gchar *p = ret;
+  gboolean need_upper = TRUE;
+
+  if (!ret)
+    return NULL;
+  while (*name)
+    {
+      if (need_upper)
+        {
+          *p++ = toupper (*name);
+          need_upper = FALSE;
+        }
+      else if (*name == '-')
+        need_upper = TRUE;
+      else if (*name == ':')
+        {
+          need_upper = TRUE;
+          *p++ = *name;
+        }
+      else
+        *p++ = *name;
+      name++;
+    }
+  *p = '\0';
+  return ret;
+}
+
+static DBusHandlerResult
+signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  guint res = DBUS_HANDLER_RESULT_HANDLED;
+  const gint   type    = dbus_message_get_type (message);
+  const char *iface = dbus_message_get_interface (message);
+  const char *member = dbus_message_get_member (message);
+
+  if (type != DBUS_MESSAGE_TYPE_SIGNAL)
+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  if (!g_strcmp0(iface, DBUS_INTERFACE_DBUS) &&
+      !g_strcmp0(member, "NameOwnerChanged"))
+      handle_disconnection (bus, message, user_data);
+  else
+      res = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  return res;
+}
+
+/* org.at_spi.Socket interface */
+/*---------------------------------------------------------------------------*/
+
+static DBusMessage*
+impl_Embed (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
+  DBusMessageIter iter, iter_struct;
+  const gchar *app_name, *obj_path;
+
+  DBusMessage *reply = NULL;
+  DBusMessageIter reply_iter;
+
+  dbus_message_iter_init (message, &iter);
+  dbus_message_iter_recurse (&iter, &iter_struct);
+  if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
+       goto error;
+  dbus_message_iter_get_basic (&iter_struct, &app_name);
+  if (!app_name)
+    app_name = dbus_message_get_sender (message);
+  if (!dbus_message_iter_next (&iter_struct))
+        goto error;
+  if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
+       goto error;
+  dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+  add_application(reg, bus, app_name, obj_path);
+
+  set_id (reg, bus, app_name, obj_path);
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &reply_iter);
+  append_reference (&reply_iter, 
+                    dbus_bus_get_unique_name (bus),
+                    SPI_DBUS_PATH_ROOT);
+
+  return reply;
+error:
+  return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
+}
+
+static DBusMessage*
+impl_Unembed (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
+  DBusMessageIter iter, iter_struct;
+  gchar *app_name, *obj_path;
+  guint index;
+
+  dbus_message_iter_init (message, &iter);
+  dbus_message_iter_recurse (&iter, &iter_struct);
+  if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
+       goto error;
+  dbus_message_iter_get_basic (&iter_struct, &app_name);
+  if (!dbus_message_iter_next (&iter_struct))
+        goto error;
+  if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
+       goto error;
+  dbus_message_iter_get_basic (&iter_struct, &obj_path);
+
+  if (find_index_of_reference (reg->apps, app_name, obj_path, &index))
+      remove_application(reg, bus, index);
+
+  return NULL;
+error:
+  return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
+}
+
+/* org.at_spi.Component interface */
+/*---------------------------------------------------------------------------*/
+
 static DBusMessage *
-impl_accessibility_registry_register_application (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
-  SpiRegistry *registry = SPI_REGISTRY (user_data);
-  const char *application = dbus_message_get_sender (message);
+  dbus_bool_t retval = FALSE;
+  DBusMessage *reply;
 
-#ifdef SPI_DEBUG
-  fprintf (stderr, "registering app %s\n", application);
-#endif
-  spi_desktop_add_application (registry->desktop, application);
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
 
-  /*
-   * TODO: change the implementation below to a WM-aware one;
-   * e.g. don't add all apps to the SpiDesktop
-   */
-  return dbus_message_new_method_return (message);
+static DBusMessage *
+impl_GetAccessibleAtPoint (DBusConnection * bus, DBusMessage * message,
+                           void *user_data)
+{
+  DBusMessage *reply = NULL;
+  DBusMessageIter iter;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &iter);
+  append_reference (&iter, 
+                    dbus_bus_get_unique_name (bus),
+                    SPI_DBUS_PATH_NULL);
+
+  return reply;
 }
 
-/**
- * deregisterApplication:
- * @application: a reference to the @Application
- * to be deregistered.
- * return values: void
- *
- * De-register an application previously registered with the broker.
- *
- **/
 static DBusMessage *
-impl_accessibility_registry_deregister_application (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
-  SpiRegistry *registry = SPI_REGISTRY (user_data);
-  const char *application = dbus_message_get_sender (message);
+  dbus_int32_t x = 0, y = 0, width = 1024, height = 768;
+  DBusMessage *reply;
+  DBusMessageIter iter, iter_struct;
 
-  spi_desktop_remove_application (registry->desktop, application);
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_STRUCT, NULL,
+                                    &iter_struct);
+    dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &x);
+    dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &y);
+    dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &width);
+    dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &height);
+  dbus_message_iter_close_container (&iter, &iter_struct);
+  return reply;
+}
 
-#ifdef SPI_DEBUG
-  fprintf (stderr, "de-registered app %s\n", application);
-#endif
-  return dbus_message_new_method_return (message);
+static DBusMessage *
+impl_GetPosition (DBusConnection * bus, DBusMessage * message,
+                  void *user_data)
+{
+  DBusMessage *reply;
+  dbus_int32_t x = 0, y = 0;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32,
+                            &y, DBUS_TYPE_INVALID);
+  return reply;
 }
 
-/**
- * getDesktopCount:
- * return values: a short integer indicating the current number of
- * @Desktops.
- *
- * Get the current number of desktops.
- *
- **/
 static DBusMessage *
-impl_accessibility_registry_get_desktop_count (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetSize (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
-  dbus_int16_t n_desktops = 1;
+  /* TODO - Get the screen size */
   DBusMessage *reply;
+  dbus_int32_t width = 1024, height = 768;
 
-  /* TODO: implement support for multiple virtual desktops */
   reply = dbus_message_new_method_return (message);
-  if (reply)
-  {
-    dbus_message_append_args (reply, DBUS_TYPE_INT16, &n_desktops, DBUS_TYPE_INVALID);
-  }
+  dbus_message_append_args (reply, DBUS_TYPE_INT32, &width,
+                            DBUS_TYPE_INT32, &height, DBUS_TYPE_INVALID);
   return reply;
 }
 
-/**
- * getDesktop:
- * @n: the index of the requested @Desktop.
- * return values: a reference to the requested @Desktop.
- *
- * Get the nth accessible desktop.
- *
- **/
+#define LAYER_WIDGET 3;
+
 static DBusMessage *
-impl_accessibility_registry_get_desktop (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetLayer (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
-  DBusError error;
-  dbus_int16_t n;
-  const char *path;
   DBusMessage *reply;
+  dbus_uint32_t rv = LAYER_WIDGET;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetMDIZOrder (DBusConnection * bus, DBusMessage * message,
+                   void *user_data)
+{
+  DBusMessage *reply;
+  dbus_int16_t rv = 0;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_INT16, &rv,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GrabFocus (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply;
+  dbus_bool_t retval = FALSE;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &retval,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetAlpha (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+  double rv = 1.0;
+  DBusMessage *reply;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_DOUBLE, &rv,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
+
+/* org.at_spi.Accessible interface */
+/*---------------------------------------------------------------------------*/
+
+static dbus_bool_t
+impl_get_Name (DBusMessageIter * iter, void *user_data)
+{
+  const gchar *name = "main";
+  return return_v_string (iter, name);
+}
+
+static dbus_bool_t
+impl_get_Description (DBusMessageIter * iter, void *user_data)
+{
+  const gchar *description = "";
+  return return_v_string (iter, description);
+}
+
+static dbus_bool_t
+impl_get_Parent (DBusMessageIter * iter, void *user_data)
+{
+  const gchar *name = "";
+  DBusMessageIter iter_variant;
+
+  dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "(so)",
+                                    &iter_variant);
+  append_reference (&iter_variant, 
+                    name,
+                    SPI_DBUS_PATH_NULL);
+  dbus_message_iter_close_container (iter, &iter_variant);
+  return TRUE;
+}
+
+static dbus_bool_t
+impl_get_ChildCount (DBusMessageIter * iter, void *user_data)
+{
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
+  dbus_int32_t rv = reg->apps->len;
+  dbus_bool_t result;
+  DBusMessageIter iter_variant;
+
+  if (!dbus_message_iter_open_container (iter, DBUS_TYPE_VARIANT, "i",
+                                         &iter_variant))
+    return FALSE;
+  result = dbus_message_iter_append_basic (&iter_variant, DBUS_TYPE_INT32, &rv);
+  dbus_message_iter_close_container (iter, &iter_variant);
+  return result;
+}
+
+static dbus_bool_t
+impl_get_ToolkitName (DBusMessageIter * iter, void *user_data)
+{
+  return return_v_string (iter, "at-spi-registry");
+}
+
+static dbus_bool_t
+impl_get_ToolkitVersion (DBusMessageIter * iter, void *user_data)
+{
+  return return_v_string (iter, "2.0");
+}
+
+static DBusMessage *
+impl_GetChildAtIndex (DBusConnection * bus,
+                      DBusMessage * message, void *user_data)
+{
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
+  DBusMessage *reply;
+  DBusMessageIter iter;
+  DBusError error;
+  SpiReference *ref;
+  dbus_int32_t i;
 
-  /* TODO: implement support for multiple virtual desktops */
   dbus_error_init (&error);
-  if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT16, &n, DBUS_TYPE_INVALID))
-  {
-    return spi_dbus_general_error (message);
-  }
-  path = (n == 0? SPI_DBUS_PATH_DESKTOP: "/");
+  if (!dbus_message_get_args 
+       (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+    {
+      return dbus_message_new_error (message, DBUS_ERROR_FAILED, "Invalid arguments");
+    }
+
   reply = dbus_message_new_method_return (message);
-  if (reply)
-  {
-    dbus_message_append_args (reply, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
-  }
+  dbus_message_iter_init_append (reply, &iter);
+
+  if (i < 0 || i >= reg->apps->len)
+    append_reference (&iter, SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_NULL);
+  else
+    {
+      ref = g_ptr_array_index (reg->apps, i);
+      append_reference (&iter, ref->name, ref->path);
+    }
+
   return reply;
 }
 
+static DBusMessage *
+impl_GetChildren (DBusConnection * bus,
+                  DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply = NULL;
+  DBusMessageIter iter, iter_array;
+  SpiRegistry *reg = SPI_REGISTRY (user_data);
+  int i;
+
+  reply = dbus_message_new_method_return (message);
+
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(so)", &iter_array);
+  for (i=0; i < reg->apps->len; i++)
+    {
+      SpiReference *current = g_ptr_array_index (reg->apps, i);
+      append_reference (&iter_array, current->name, current->path);
+    }
+  dbus_message_iter_close_container(&iter, &iter_array);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetIndexInParent (DBusConnection * bus,
+                       DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply;
+  dbus_uint32_t rv = 0;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_INT32, &rv, DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetRelationSet (DBusConnection * bus,
+                     DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply;
+  DBusMessageIter iter, iter_array;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ua(so))", &iter_array);
+  dbus_message_iter_close_container (&iter, &iter_array);
+
+  return reply;
+}
+
+static DBusMessage *
+impl_GetRole (DBusConnection * bus, DBusMessage * message, void * user_data)
+{
+  DBusMessage *reply;
+  dbus_uint32_t rv = 14;       /* TODO: Get DESKTOP_FRAME from somewhere */
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv, DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetRoleName (DBusConnection * bus,
+                  DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply;
+  const char *role_name = "desktop frame";
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
 
-/**
- * getDesktopList:
- * return values: a sequence containing references to
- * the @Desktops.
- *
- * Get a list of accessible desktops.
- *
- **/
 static DBusMessage *
-impl_accessibility_registry_get_desktop_list (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetLocalizedRoleName (DBusConnection * bus,
+                           DBusMessage * message, void *user_data)
 {
+  /* TODO - Localize this */
   DBusMessage *reply;
+  const char *role_name = "desktop frame";
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args (reply, DBUS_TYPE_STRING, &role_name,
+                            DBUS_TYPE_INVALID);
+  return reply;
+}
+
+static DBusMessage *
+impl_GetState (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply = NULL;
   DBusMessageIter iter, iter_array;
-  const char *path = SPI_DBUS_PATH_DESKTOP;
+
+  dbus_uint32_t states[2] = {0, 0};
+  guint count;
 
   reply = dbus_message_new_method_return (message);
-  if (!reply) return NULL;
-  dbus_message_iter_init_append(reply, &iter);
-  if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "o", &iter_array)) goto oom;
-  dbus_message_iter_append_basic(&iter_array, DBUS_TYPE_STRING, &path);
-  if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom;
+  dbus_message_iter_init_append (reply, &iter);
+
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "u", &iter_array);
+  for (count = 0; count < 2; count++)
+    {
+      dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_UINT32,
+                                      &states[count]);
+    }
+  dbus_message_iter_close_container (&iter, &iter_array);
   return reply;
-oom:
-  // TODO: handle out-of-memory
+}
+
+static DBusMessage *
+impl_GetAttributes (DBusConnection * bus,
+                    DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply = NULL;
+  DBusMessageIter iter, array;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}", &array);
+  dbus_message_iter_close_container (&iter, &array);
+
   return reply;
 }
 
+static DBusMessage *
+impl_GetApplication (DBusConnection * bus,
+                     DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply = NULL;
+  DBusMessageIter iter;
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_iter_init_append (reply, &iter);
+  append_reference (&iter,
+                    dbus_bus_get_unique_name (bus),
+                    SPI_DBUS_PATH_NULL);
+
+  return reply;
+}
 
 static DBusMessage *
-impl_accessibility_registry_get_device_event_controller (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetInterfaces (DBusConnection * bus,
+                    DBusMessage * message, void *user_data)
 {
   DBusMessage *reply;
-  const char *path = SPI_DBUS_PATH_DEC;
+  DBusMessageIter iter, iter_array;
+
+  const char *acc = SPI_DBUS_INTERFACE_ACCESSIBLE;
+  const char *com = SPI_DBUS_INTERFACE_COMPONENT;
 
   reply = dbus_message_new_method_return (message);
-  if (reply)
+
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s",
+                                    &iter_array);
+    dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &acc);
+    dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &com);
+  dbus_message_iter_close_container (&iter, &iter_array);
+
+  return reply;
+}
+
+static DBusMessage *
+impl_GetItems (DBusConnection * bus, DBusMessage * message, void *user_data)
+{
+  DBusMessage *reply;
+  DBusMessageIter iter, iter_array;
+
+  reply = dbus_message_new_method_return (message);
+
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
+                                    "((so)(so)(so)a(so)assusau)", &iter_array);
+  dbus_message_iter_close_container (&iter, &iter_array);
+  return reply;
+}
+
+/* I would rather these two be signals, but I'm not sure that dbus-python
+ * supports emitting signals except for a service, so implementing as both
+ * a method call and signal for now.
+ */
+static DBusMessage *
+impl_register_event (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiRegistry *registry = SPI_REGISTRY (user_data);
+  const char *orig_name;
+  gchar *name;
+  event_data *evdata;
+  gchar **data;
+  DBusMessage *signal;
+  const char *sender = dbus_message_get_sender (message);
+  DBusMessageIter iter, iter_array;
+  const char *signature = dbus_message_get_signature (message);
+
+  if (strcmp (signature, "sas") != 0 &&
+      strcmp (signature, "s") != 0)
+  {
+    g_warning ("got RegisterEvent with invalid signature '%s'", signature);
+    return NULL;
+  }
+
+  dbus_message_iter_init (message, &iter);
+  dbus_message_iter_get_basic (&iter, &orig_name);
+  dbus_message_iter_next (&iter);
+  name = ensure_proper_format (orig_name);
+
+  evdata = g_new0 (event_data, 1);
+  data = g_strsplit (name, ":", 3);
+  evdata->bus_name = g_strdup (sender);
+  evdata->data = data;
+
+  if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY)
   {
-    dbus_message_append_args (reply, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
+    dbus_message_iter_recurse (&iter, &iter_array);
+    while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+    {
+      const char *property;
+      dbus_message_iter_get_basic (&iter_array, &property);
+      evdata->properties = g_slist_append (evdata->properties,
+                                           g_strdup (property));
+      dbus_message_iter_next (&iter_array);
+    }
   }
+  registry->events = g_list_append (registry->events, evdata);
+
+  if (needs_mouse_poll (evdata->data))
+    {
+      spi_device_event_controller_start_poll_mouse (registry);
+    }
+
+  signal = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
+                                    SPI_DBUS_INTERFACE_REGISTRY,
+                                    "EventListenerRegistered");
+  if (signal)
+  {
+    GSList *ls = evdata->properties;
+    dbus_message_iter_init_append (signal, &iter);
+    dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &sender);
+    dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &name);
+    dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "s", &iter_array);
+    while (ls)
+    {
+      dbus_message_iter_append_basic (&iter_array, DBUS_TYPE_STRING, &ls->data);
+      ls = g_slist_next (ls);
+    }
+    dbus_message_iter_close_container (&iter, &iter_array);
+    dbus_connection_send (bus, signal, NULL);
+    dbus_message_unref (signal);
+  }
+
+  g_free (name);
+  return dbus_message_new_method_return (message);
+}
+
+static DBusMessage *
+impl_deregister_event (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiRegistry *registry = SPI_REGISTRY (user_data);
+  const char *orig_name;
+  gchar *name;
+  const char *sender = dbus_message_get_sender (message);
+
+  if (!dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &orig_name,
+    DBUS_TYPE_INVALID))
+    return NULL;
+  name = ensure_proper_format (orig_name);
+
+  remove_events (registry, sender, name);
+
+  g_free (name);
+  return dbus_message_new_method_return (message);
+}
+
+static DBusMessage *
+impl_get_registered_events (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  SpiRegistry *registry = SPI_REGISTRY (user_data);
+  event_data *evdata;
+  DBusMessage *reply;
+  DBusMessageIter iter, iter_struct, iter_array;
+  GList *list;
+
+  reply = dbus_message_new_method_return (message);
+  if (!reply)
+    return NULL;
+
+  dbus_message_iter_init_append (reply, &iter);
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(ss)", &iter_array);
+  for (list = registry->events; list; list = list->next)
+    {
+      gchar *str;
+      evdata = list->data;
+      str = g_strconcat (evdata->data [0],
+                         ":", (evdata->data [1]? evdata->data [1]: ""),
+                         ":", (evdata->data [1] && evdata->data [2]? evdata->data [2]: ""), NULL);
+      dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct);
+      dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &evdata->bus_name);
+      dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &str);
+      dbus_message_iter_close_container (&iter_array, &iter_struct);
+      g_free (str);
+    }
+  dbus_message_iter_close_container (&iter, &iter_array);
   return reply;
 }
 
+/*---------------------------------------------------------------------------*/
 
-static void
-spi_registry_class_init (SpiRegistryClass *klass)
+static void 
+emit_Available (DBusConnection * bus)
 {
-  GObjectClass * object_class = (GObjectClass *) klass;
+  DBusMessage *sig;
+  DBusMessageIter iter;
+  
+  sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, SPI_DBUS_INTERFACE_SOCKET, "Available");
 
-  spi_registry_parent_class = g_type_class_ref (G_TYPE_OBJECT);
+  dbus_message_iter_init_append(sig, &iter);
+  append_reference (&iter, SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_ROOT);
+
+  dbus_connection_send(bus, sig, NULL);
+  dbus_message_unref(sig);
+}
+
+/*---------------------------------------------------------------------------*/
+
+static const char *introspection_header =
+"<?xml version=\"1.0\"?>\n";
+
+static const char *introspection_node_element =
+"<node name=\"%s\">\n";
+
+static const char *introspection_footer =
+"</node>";
+
+static DBusMessage *
+impl_Introspect_root (DBusConnection * bus,
+                 DBusMessage * message, void *user_data)
+{
+  GString *output;
+  gchar *final;
+
+  const gchar *pathstr = SPI_DBUS_PATH_ROOT;
+
+  DBusMessage *reply;
+
+  output = g_string_new(introspection_header);
+
+  g_string_append_printf(output, introspection_node_element, pathstr);
+
+  g_string_append (output, spi_org_a11y_atspi_Accessible);
+  g_string_append (output, spi_org_a11y_atspi_Component);
+
+  g_string_append(output, introspection_footer);
+  final = g_string_free(output, FALSE);
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID);
+
+  g_free(final);
+  return reply;
+}
+
+static DBusMessage *
+impl_Introspect_registry (DBusConnection * bus,
+                 DBusMessage * message, void *user_data)
+{
+  GString *output;
+  gchar *final;
+
+  const gchar *pathstr = SPI_DBUS_PATH_REGISTRY;
+
+  DBusMessage *reply;
+
+  output = g_string_new(introspection_header);
+
+  g_string_append_printf(output, introspection_node_element, pathstr);
+
+  g_string_append (output, spi_org_a11y_atspi_Registry);
+
+  g_string_append(output, introspection_footer);
+  final = g_string_free(output, FALSE);
+
+  reply = dbus_message_new_method_return (message);
+  dbus_message_append_args(reply, DBUS_TYPE_STRING, &final, DBUS_TYPE_INVALID);
+
+  g_free(final);
+  return reply;
+}
+
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Emits an AT-SPI event.
+ * AT-SPI events names are split into three parts:
+ * class:major:minor
+ * This is mapped onto D-Bus events as:
+ * D-Bus Interface:Signal Name:Detail argument
+ *
+ * Marshals a basic type into the 'any_data' attribute of
+ * the AT-SPI event.
+ */
+static void 
+emit_event (DBusConnection *bus,
+            const char *klass,
+            const char *major,
+            const char *minor,
+            dbus_int32_t detail1,
+            dbus_int32_t detail2,
+            const char *name,
+            const char *path)
+{
+  DBusMessage *sig;
+  DBusMessageIter iter, iter_variant;
   
-  object_class->finalize = spi_registry_object_finalize;
+  sig = dbus_message_new_signal(SPI_DBUS_PATH_ROOT, klass, major);
+
+  dbus_message_iter_init_append(sig, &iter);
+
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &minor);
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail1);
+  dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &detail2);
+
+  dbus_message_iter_open_container (&iter, DBUS_TYPE_VARIANT, "(so)",
+                                    &iter_variant);
+    append_reference (&iter_variant, name, path);
+  dbus_message_iter_close_container (&iter, &iter_variant);
+
+  append_reference (&iter,
+                    dbus_bus_get_unique_name (bus),
+                    SPI_DBUS_PATH_ROOT);
+
+  dbus_connection_send(bus, sig, NULL);
+  dbus_message_unref(sig);
 }
 
-static DBusObjectPathVTable droute_vtable =
+/*---------------------------------------------------------------------------*/
+
+/*
+ * Children changed signal converter and forwarder.
+ *
+ * Klass (Interface) org.a11y.atspi.Event.Object
+ * Major is the signal name.
+ * Minor is 'add' or 'remove'
+ * detail1 is the index.
+ * detail2 is 0.
+ * any_data is the child reference.
+ */
+
+static void
+children_added_listener (DBusConnection * bus,
+                         gint             index,
+                         const gchar    * name,
+                         const gchar    * path)
 {
-  NULL,
-  &droute_message,
-  NULL, NULL, NULL, NULL
-};
+  emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "add", index, 0,
+              name, path);
+}
 
 static void
-spi_registry_init (SpiRegistry *registry)
+children_removed_listener (DBusConnection * bus,
+                           gint             index,
+                           const gchar    * name,
+                           const gchar    * path)
 {
-  DBusError error;
+  emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0,
+              name, path);
+}
 
-  spi_registry_set_debug (g_getenv ("AT_SPI_DEBUG"));
-  /*
-   * TODO: FIXME, this module makes the foolish assumptions that
-   * registryd uses the same display as the apps, and that the
-   * DISPLAY environment variable is set.
-   */
-  gdk_init (NULL, NULL);
+/*---------------------------------------------------------------------------*/
 
-  registry->exit_notify_timeout = 200;
-  registry->queue_handler_id  = 0;
+static DBusHandlerResult
+handle_method_root (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-  dbus_error_init (&error);
-  registry->droute.bus = dbus_bus_get(DBUS_BUS_SESSION, &error);
-  if (!registry->droute.bus)
-  {
-    g_warning("Couldn't connect to dbus: %s\n", error.message);
-    return;
-  }
-  spi_registry_initialize_registry_interface (&registry->droute);
-  spi_registry_initialize_desktop_interface (&registry->droute);
-  spi_registry_initialize_dec_interface (&registry->droute);
-  // todo: initialize accessible and component interfaces, for desktop?
-  if (!dbus_connection_try_register_fallback (registry->droute.bus, "/org/freedesktop/atspi", &droute_vtable, &registry->droute, &error))
-  {
-    g_warning("Couldn't register droute.\n");
-  }
-  dbus_connection_setup_with_g_main(registry->droute.bus, g_main_context_default());
+  const gchar *iface   = dbus_message_get_interface (message);
+  const gchar *member  = dbus_message_get_member (message);
+  const gint   type    = dbus_message_get_type (message);
+
+  DBusMessage *reply = NULL;
 
-  // TODO: decide whether focus_object is still relevant
-  registry->desktop = spi_desktop_new ();
-  /* Register callback notification for application addition and removal */
-  g_signal_connect (G_OBJECT (registry->desktop),
-                   "application_added",
-                   G_CALLBACK (desktop_add_application),
-                   registry);
+  /* Check for basic reasons not to handle */
+  if (type   != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+      member == NULL ||
+      iface  == NULL)
+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-  g_signal_connect (G_OBJECT (registry->desktop),
-                   "application_removed",
-                   G_CALLBACK (desktop_remove_application),
-                   registry);
+  if (!strcmp (iface, "org.freedesktop.DBus.Properties"))
+    {
+      if (!strcmp (member, "Get"))
+        {
+          const gchar *prop_iface;
+          const gchar *prop_member;
+          DBusError error;
 
-  registry->de_controller = spi_device_event_controller_new (registry);
+          dbus_error_init (&error);
+          if (dbus_message_get_args (message,
+                                     &error,
+                                     DBUS_TYPE_STRING,
+                                     &prop_iface,
+                                     DBUS_TYPE_STRING,
+                                     &prop_member,
+                                     DBUS_TYPE_INVALID))
+            {
+              DBusMessageIter iter;
+
+              reply = dbus_message_new_method_return (message);
+              dbus_message_iter_init_append (reply, &iter);
+
+
+              if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_ACCESSIBLE))
+                {
+                  if      (!strcmp (prop_member, "Name"))
+                    impl_get_Name (&iter, user_data);
+                  else if (!strcmp (prop_member, "Description"))
+                    impl_get_Description (&iter, user_data);
+                  else if (!strcmp (prop_member, "Parent"))
+                    impl_get_Parent (&iter, user_data);
+                  else if (!strcmp (prop_member, "ChildCount"))
+                    impl_get_ChildCount (&iter, user_data);
+                  else
+                    {
+                      dbus_message_unref (reply); 
+                      reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+                    }
+                }
+              else if (!strcmp (prop_iface, SPI_DBUS_INTERFACE_APPLICATION))
+                {
+                  if (!strcmp (prop_member, "ToolkitName"))
+                    impl_get_ToolkitName (&iter, user_data);
+                  else if (!strcmp (prop_member, "ToolkitVersion"))
+                    impl_get_ToolkitVersion (&iter, user_data);
+                  else
+                    {
+                      dbus_message_unref (reply); 
+                      reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+                    }
+                }
+              else
+                {
+                  dbus_message_unref (reply); 
+                  reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, "Property unavailable");
+                }
+            }
+          else
+            {
+              reply = dbus_message_new_error (message, DBUS_ERROR_FAILED, error.message);
+            }
+          result = DBUS_HANDLER_RESULT_HANDLED;
+        }
+      else if (!strcmp (member, "GetAll"))
+        {
+          result = DBUS_HANDLER_RESULT_HANDLED;
+        }
+    }
+
+  if (!strcmp (iface, SPI_DBUS_INTERFACE_ACCESSIBLE))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "GetChildAtIndex"))
+          reply = impl_GetChildAtIndex (bus, message, user_data);
+      else if (!strcmp (member, "GetChildren"))
+          reply = impl_GetChildren (bus, message, user_data);
+      else if (!strcmp (member, "GetIndexInParent"))
+          reply = impl_GetIndexInParent (bus, message, user_data);
+      else if (!strcmp (member, "GetRelationSet"))
+          reply = impl_GetRelationSet (bus, message, user_data);
+      else if (!strcmp (member, "GetRole"))
+          reply = impl_GetRole (bus, message, user_data);
+      else if (!strcmp (member, "GetRoleName"))
+          reply = impl_GetRoleName (bus, message, user_data);
+      else if (!strcmp (member, "GetLocalizedRoleName"))
+          reply = impl_GetLocalizedRoleName (bus, message, user_data);
+      else if (!strcmp (member, "GetState"))
+          reply = impl_GetState (bus, message, user_data);
+      else if (!strcmp (member, "GetAttributes"))
+          reply = impl_GetAttributes (bus, message, user_data);
+      else if (!strcmp (member, "GetApplication"))
+          reply = impl_GetApplication (bus, message, user_data);
+      else if (!strcmp (member, "GetInterfaces"))
+          reply = impl_GetInterfaces (bus, message, user_data);
+      else
+         result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (!strcmp (iface, SPI_DBUS_INTERFACE_COMPONENT))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "Contains"))
+          reply = impl_Contains (bus, message, user_data);
+      else if (!strcmp (member, "GetAccessibleAtPoint"))
+          reply = impl_GetAccessibleAtPoint (bus, message, user_data);
+      else if (!strcmp (member, "GetExtents"))
+          reply = impl_GetExtents (bus, message, user_data);
+      else if (!strcmp (member, "GetPosition"))
+          reply = impl_GetPosition (bus, message, user_data);
+      else if (!strcmp (member, "GetSize"))
+          reply = impl_GetSize (bus, message, user_data);
+      else if (!strcmp (member, "GetLayer"))
+          reply = impl_GetLayer (bus, message, user_data);
+      else if (!strcmp (member, "GetMDIZOrder"))
+          reply = impl_GetMDIZOrder (bus, message, user_data);
+      else if (!strcmp (member, "GrabFocus"))
+          reply = impl_GrabFocus (bus, message, user_data);
+      else if (!strcmp (member, "GetAlpha"))
+          reply = impl_GetAlpha (bus, message, user_data);
+      else
+         result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (!strcmp (iface, SPI_DBUS_INTERFACE_SOCKET))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "Embed"))
+          reply = impl_Embed (bus, message, user_data);
+      else if (!strcmp (member, "Unembed"))
+          reply = impl_Unembed (bus, message, user_data);
+      else
+          result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (!strcmp (iface, "org.freedesktop.DBus.Introspectable"))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "Introspect"))
+          reply = impl_Introspect_root (bus, message, user_data);
+      else
+          result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (result == DBUS_HANDLER_RESULT_HANDLED)
+    {
+      if (!reply)
+        {
+          reply = dbus_message_new_method_return (message);
+        }
+
+      dbus_connection_send (bus, reply, NULL);
+      dbus_message_unref (reply);
+    }
+#if 0
+  else
+    {
+      g_print ("Registry | Unhandled message : %s|%s\n", iface, member);
+    }
+#endif
+  
+  return result;
 }
 
-SpiRegistry *
-spi_registry_new (void)
+static DBusHandlerResult
+handle_method_cache (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
-  SpiRegistry *retval = g_object_new (SPI_REGISTRY_TYPE, NULL);
-  return retval;
+  DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  const gchar *iface   = dbus_message_get_interface (message);
+  const gchar *member  = dbus_message_get_member (message);
+  const gint   type    = dbus_message_get_type (message);
+
+  DBusMessage *reply = NULL;
+
+  /* Check for basic reasons not to handle */
+  if (type   != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+      member == NULL ||
+      iface  == NULL)
+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  if (!strcmp (iface, SPI_DBUS_INTERFACE_CACHE))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "GetItems"))
+          reply = impl_GetItems (bus, message, user_data);
+      else
+         result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (result == DBUS_HANDLER_RESULT_HANDLED)
+    {
+      if (!reply)
+        {
+          reply = dbus_message_new_method_return (message);
+        }
+
+      dbus_connection_send (bus, reply, NULL);
+      dbus_message_unref (reply);
+    }
+  return result;
+}
+
+static DBusHandlerResult
+handle_method_registry (DBusConnection *bus, DBusMessage *message, void *user_data)
+{
+  DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  const gchar *iface   = dbus_message_get_interface (message);
+  const gchar *member  = dbus_message_get_member (message);
+  const gint   type    = dbus_message_get_type (message);
+
+  DBusMessage *reply = NULL;
+
+  /* Check for basic reasons not to handle */
+  if (type   != DBUS_MESSAGE_TYPE_METHOD_CALL ||
+      member == NULL ||
+      iface  == NULL)
+      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+  if (!strcmp (iface, SPI_DBUS_INTERFACE_REGISTRY))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if (!strcmp(member, "RegisterEvent"))
+      reply = impl_register_event (bus, message, user_data);
+      else if (!strcmp(member, "DeregisterEvent"))
+        reply = impl_deregister_event (bus, message, user_data);
+      else if (!strcmp(member, "GetRegisteredEvents"))
+        reply = impl_get_registered_events (bus, message, user_data);
+      else
+          result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (!strcmp (iface, "org.freedesktop.DBus.Introspectable"))
+    {
+      result = DBUS_HANDLER_RESULT_HANDLED;
+      if      (!strcmp (member, "Introspect"))
+          reply = impl_Introspect_registry (bus, message, user_data);
+      else
+          result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+  if (result == DBUS_HANDLER_RESULT_HANDLED)
+    {
+      if (!reply)
+        {
+          reply = dbus_message_new_method_return (message);
+        }
+
+      dbus_connection_send (bus, reply, NULL);
+      dbus_message_unref (reply);
+    }
+#if 0
+  else
+    {
+      g_print ("Registry | Unhandled message : %s|%s\n", iface, member);
+    }
+#endif
+  
+  return result;
 }
 
-static DRouteMethod methods[] =
+/*---------------------------------------------------------------------------*/
+
+static DBusObjectPathVTable root_vtable =
+{
+  NULL,
+  &handle_method_root,
+  NULL, NULL, NULL, NULL
+};
+
+static DBusObjectPathVTable registry_vtable =
 {
-  { impl_accessibility_registry_register_application , "registerApplication" },
-  { impl_accessibility_registry_deregister_application, "deregisterApplication" },
-  { impl_accessibility_registry_get_desktop_count, "getDesktopCount" },
-  { impl_accessibility_registry_get_desktop, "getDesktop" },
-  { impl_accessibility_registry_get_desktop_list, "getDesktopList" },
-  { impl_accessibility_registry_get_device_event_controller, "getDeviceEventController" },
-  { NULL, NULL }
+  NULL,
+  &handle_method_registry,
+  NULL, NULL, NULL, NULL
 };
 
-void
-spi_registry_initialize_registry_interface (DRouteData * data)
+static DBusObjectPathVTable cache_vtable =
 {
-  droute_add_interface (data, "org.freedesktop.atspi.Registry", methods,
-                       NULL, NULL, NULL);
+  NULL,
+  &handle_method_cache,
+  NULL, NULL, NULL, NULL
 };
+
+static gchar *app_sig_match_name_owner =
+       "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'";
+
+SpiRegistry *
+spi_registry_new (DBusConnection *bus)
+{
+  SpiRegistry *reg = g_object_new (SPI_REGISTRY_TYPE, NULL);
+
+  reg->bus = bus;
+
+  dbus_bus_add_match (bus, app_sig_match_name_owner, NULL);
+  dbus_connection_add_filter (bus, signal_filter, reg, NULL);
+
+  dbus_connection_register_object_path (bus, SPI_DBUS_PATH_ROOT, &root_vtable, reg);
+
+  dbus_connection_register_object_path (bus, SPI_DBUS_PATH_CACHE, &cache_vtable, reg);
+
+  dbus_connection_register_object_path (bus, SPI_DBUS_PATH_REGISTRY, &registry_vtable, reg);
+
+  emit_Available (bus);
+
+  reg->events = NULL;
+
+  return reg;
+}
+
+/*END------------------------------------------------------------------------*/