[at-spi2-core: 6/6] Merge branch 'master' into mgorse

[Mike Gorse <mgorse src gnome org>]

commit c1757b9e16d81434c25e435674cfe565b72eec11
Merge: df01307... 6158a79...
Author: Mike Gorse <mgorse novell com>
Date:   Mon Nov 16 13:18:09 2009 -0500

    Merge branch 'master' into mgorse
    
    Conflicts:
    	registryd/deviceeventcontroller.c
    	registryd/registry.c

 .gitignore                             |    1 +
 Makefile.am                            |    2 +-
 README                                 |   16 -
 configure.ac                           |   39 +--
 dbind/Makefile.am                      |   24 --
 dbind/dbind-any.c                      |  553 -----------------------------
 dbind/dbind-any.h                      |   31 --
 dbind/dbind-config.h.in                |    8 -
 dbind/dbind.c                          |  230 ------------
 dbind/dbind.h                          |   46 ---
 dbind/dbtest.c                         |  403 ---------------------
 droute/Makefile.am                     |   33 --
 droute/droute-pairhash.c               |   87 -----
 droute/droute-pairhash.h               |   41 ---
 droute/droute-test.c                   |  243 -------------
 droute/droute-variant.c                |  118 -------
 droute/droute-variant.h                |   35 --
 droute/droute.c                        |  595 --------------------------------
 droute/droute.h                        |   95 -----
 droute/test.interface.One              |   15 -
 droute/test.interface.Two              |   15 -
 m4/dbind.m4                            |   43 ---
 pkgconfig/Makefile.am                  |    2 -
 pkgconfig/dbind-0.1-uninstalled.pc.in  |    8 -
 pkgconfig/dbind-0.1.pc.in              |   11 -
 pkgconfig/droute-0.1-uninstalled.pc.in |    8 -
 pkgconfig/droute-0.1.pc.in             |   11 -
 registryd/Makefile.am                  |    3 +-
 registryd/deviceeventcontroller.c      |  106 +++++--
 registryd/deviceeventcontroller.h      |    7 +-
 registryd/registry-main.c              |   10 +-
 registryd/registry.c                   |   63 +++-
 registryd/registry.h                   |    5 +-
 33 files changed, 137 insertions(+), 2770 deletions(-)
---
diff --cc registryd/deviceeventcontroller.c
index 92acccc,9b855ac..9f1b9ae
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@@ -2759,17 -2777,58 +2777,58 @@@ static void wait_for_release_event (XEv
    check_release_handler = g_timeout_add (CHECK_RELEASE_DELAY, check_release, &pressed_event);
  }
  
- static DRouteMethod dev_methods[] =
+ static DBusHandlerResult
+ handle_dec_method (DBusConnection *bus, DBusMessage *message, void *user_data)
+ {
+   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_DEC))
+       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
 -  if      (!strcmp (member, "registerKeystrokeListener"))
++  if      (!strcmp (member, "RegisterKeystrokeListener"))
+       reply = impl_register_keystroke_listener (bus, message, user_data);
 -  else if (!strcmp (member, "registerDeviceEventListener"))
++  else if (!strcmp (member, "RegisterDeviceEventListener"))
+       reply = impl_register_device_event_listener (bus, message, user_data);
 -  else if (!strcmp (member, "deregisterKeystrokeListener"))
++  else if (!strcmp (member, "DeregisterKeystrokeListener"))
+       reply = impl_deregister_keystroke_listener (bus, message, user_data);
 -  else if (!strcmp (member, "deregisterDeviceEventListener"))
++  else if (!strcmp (member, "DeregisterDeviceEventListener"))
+       reply = impl_deregister_device_event_listener (bus, message, user_data);
 -  else if (!strcmp (member, "generateKeyboardEvent"))
++  else if (!strcmp (member, "GenerateKeyboardEvent"))
+       reply = impl_generate_keyboard_event (bus, message, user_data);
 -  else if (!strcmp (member, "generateMouseEvent"))
++  else if (!strcmp (member, "GenerateMouseEvent"))
+       reply = impl_generate_mouse_event (bus, message, user_data);
 -  else if (!strcmp (member, "notifyListenersSync"))
++  else if (!strcmp (member, "NotifyListenersSync"))
+       reply = impl_notify_listeners_sync (bus, message, user_data);
 -  else if (!strcmp (member, "notifyListenersAsync"))
++  else if (!strcmp (member, "NotifyListenersAsync"))
+       reply = impl_notify_listeners_async (bus, message, user_data);
+   else
+       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
+   if (!reply)
+     {
+       reply = dbus_message_new_method_return (message);
+     }
+   dbus_connection_send (bus, reply, NULL);
+   dbus_message_unref (reply);
+   
+   return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ 
+ static DBusObjectPathVTable dec_vtable =
  {
-   { impl_register_keystroke_listener, "RegisterKeystrokeListener" },
-   { impl_register_device_event_listener, "RegisterDeviceEventListener" },
-   { impl_deregister_keystroke_listener, "DeregisterKeystrokeListener" },
-   { impl_deregister_device_event_listener, "DeregisterDeviceEventListener" },
-   { impl_generate_keyboard_event, "GenerateKeyboardEvent" },
-   { impl_generate_mouse_event, "GenerateMouseEvent" },
-   { impl_notify_listeners_sync, "NotifyListenersSync" },
-   { impl_notify_listeners_async, "NotifyListenersAsync" },
-   { NULL, NULL }
+   NULL,
+   &handle_dec_method,
+   NULL, NULL, NULL, NULL
  };
  
  SpiDEController *
diff --cc registryd/registry.c
index ca66216,79251a5..f720920
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@@ -193,7 -194,7 +194,7 @@@ impl_RegisterApplication (DBusConnectio
  }
  
  static DBusMessage*
- impl_DeRegisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
 -impl_deregisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
++impl_DeregisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
  {
    gchar *app_name;
    SpiRegistry *reg = SPI_REGISTRY (user_data);
@@@ -247,12 -250,48 +250,48 @@@ signal_filter (DBusConnection *bus, DBu
  static gchar *app_sig_match_name_owner =
         "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged'";
  
- static DRouteMethod dev_methods[] =
+ static DBusHandlerResult
+ handle_registry_method (DBusConnection *bus, DBusMessage *message, void *user_data)
  {
-   { impl_GetApplications, "GetApplications" },
-   { impl_RegisterApplication, "RegisterApplication" },
-   { impl_DeRegisterApplication, "DeregisterApplication" },
-   { NULL, NULL }
+   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))
+       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
 -  if      (!strcmp (member, "getApplications"))
 -      reply = impl_getApplications (bus, message, user_data);
 -  else if (!strcmp (member, "registerApplication"))
 -      reply = impl_registerApplication (bus, message, user_data);
 -  else if (!strcmp (member, "deregisterApplication"))
 -      reply = impl_deregisterApplication (bus, message, user_data);
++  if      (!strcmp (member, "GetApplications"))
++      reply = impl_GetApplications (bus, message, user_data);
++  else if (!strcmp (member, "RegisterApplication"))
++      reply = impl_RegisterApplication (bus, message, user_data);
++  else if (!strcmp (member, "DeregisterApplication"))
++      reply = impl_DeregisterApplication (bus, message, user_data);
+   else
+       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
+   if (!reply)
+     {
+       reply = dbus_message_new_method_return (message);
+     }
+   dbus_connection_send (bus, reply, NULL);
+   dbus_message_unref (reply);
+   
+   return DBUS_HANDLER_RESULT_HANDLED;
+ }
+ 
+ static DBusObjectPathVTable registry_vtable =
+ {
+   NULL,
+   &handle_registry_method,
+   NULL, NULL, NULL, NULL
  };
  
  SpiRegistry *