2009-04-23 Mark Doffman <mark.doffman@codethink.co.uk>

[platform/core/uifw/at-spi2-atk.git] / registryd / deviceeventcontroller.c

diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index af4567b..6b67e78 100644 (file)
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -377,7 +377,7 @@ static void emit(SpiDEController *controller, const char *interface, const char
   DBusMessageIter iter, iter_variant;
   int nil = 0;
   const char *minor = "";
-  const char *path = SPI_DBUS_PATH_DEC;
+  const char *path = SPI_DBUS_PATH_DESKTOP;
 
   signal = dbus_message_new_signal (path, interface, name);
 
@@ -1388,7 +1388,7 @@ spi_key_set_contains_key (GSList                          *key_set,
 
   if (!key_set)
     {
-      g_print ("null key set!");
+      g_print ("null key set!\n");
       return TRUE;
     }
 
@@ -1895,7 +1895,7 @@ impl_register_keystroke_listener (DBusConnection *bus,
  *     method implementation
  */
 static DBusMessage *
-impl_register_device_listener (DBusConnection *bus,
+impl_register_device_event_listener (DBusConnection *bus,
                                  DBusMessage *message,
                                  void *user_data)
 {
@@ -2084,7 +2084,7 @@ impl_deregister_keystroke_listener (DBusConnection *bus,
  *     method implementation
  */
 static DBusMessage *
-impl_deregister_device_listener (DBusConnection *bus,
+impl_deregister_device_event_listener (DBusConnection *bus,
                                  DBusMessage *message,
                                  void *user_data)
 {
@@ -2747,9 +2747,9 @@ static void wait_for_release_event (XEvent          *event,
 static DRouteMethod dev_methods[] =
 {
   { impl_register_keystroke_listener, "registerKeystrokeListener" },
-  { impl_register_device_listener, "registerDeviceListener" },
+  { impl_register_device_event_listener, "registerDeviceEventListener" },
   { impl_deregister_keystroke_listener, "deregisterKeystrokeListener" },
-  { impl_deregister_device_listener, "deregisterDeviceListener" },
+  { impl_deregister_device_event_listener, "deregisterDeviceEventListener" },
   { impl_generate_keyboard_event, "generateKeyboardEvent" },
   { impl_generate_mouse_event, "generateMouseEvent" },
   { impl_notify_listeners_sync, "notifyListenersSync" },
@@ -2767,7 +2767,7 @@ spi_registry_dec_new (SpiRegistry *reg, DBusConnection *bus, DRouteContext *drou
   dec->bus = bus;
 
   path = droute_add_one (droute,
-                         "/org/freedesktop/atspi/registry/deviceeventcontroller",
+                         SPI_DBUS_PATH_DEC,
                          dec);
 
   droute_path_add_interface (path,