Use macros for interface names

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / bridge.c

diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c
index 942c73c..6daccc6 100644 (file)
--- a/atk-adaptor/bridge.c
+++ b/atk-adaptor/bridge.c
@@ -195,12 +195,10 @@ spi_app_init (AtkObject *root)
     return NULL;
   }
   //dbus_connection_set_exit_on_disconnect(ad->droute.bus, FALSE);
-  //dbus_bus_register(ad->droute.bus, &error);
+  dbus_bus_register(ad->droute.bus, &error);
   spi_dbus_initialize (&ad->droute);
-  /* Below line for testing -- it should be removed once at-spi-registryd is working */
-  if (dbus_bus_request_name(ad->droute.bus, "test.atspi.tree", 0, &error)) printf("Got test name.\n");
-  spi_register_tree_object(ad->droute.bus, "/org/freedesktop/atspi/tree");
-  if (!dbus_connection_try_register_fallback (ad->droute.bus, "/org/freedesktop/atspi/accessible/", &droute_vtable, &ad->droute, &error))
+  spi_register_tree_object(ad->droute.bus, &ad->droute, "/org/freedesktop/atspi/tree");
+  if (!dbus_connection_try_register_fallback (ad->droute.bus, "/org/freedesktop/atspi/accessible", &droute_vtable, &ad->droute, &error))
   {
     g_warning("Couldn't register droute.\n");
   }
@@ -342,8 +340,16 @@ spi_atk_bridge_toplevel_removed (AtkObject *object,
 static void
 spi_atk_bridge_register_application (const char *registry)
 {
+  DBusMessage *message, *reply;
+  DBusError error;
+
   bridge_threads_leave ();
-  // TODO: register
+  message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_REGISTRY, "registerApplication");
+  dbus_error_init (&error);
+  reply = dbus_connection_send_with_reply_and_block(this_app->droute.bus, message, 1000, &error);
+  if (error.message) g_warning (error.message);
+  if (reply) dbus_message_unref (reply);
+  if (message) dbus_message_unref (message);
   bridge_threads_enter ();
 }
 
@@ -658,7 +664,7 @@ static void emit(AtkObject *object, const char *name, const char *detail, dbus_i
   {
     g_warning("Unknown type %d in property change signal", type);
   }
-  sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", name);
+  sig = dbus_message_new_signal(path, SPI_DBUS_INTERFACE_ACCESSIBLE, name);
   dbus_message_iter_init_append(sig, &iter);
   if (!detail) detail = "";
   dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &detail);
@@ -692,7 +698,7 @@ static void emit_rect(AtkObject *object, const char *name, const char *detail, A
   y = rect->y;
   width = rect->width;
   height = rect->height;
-  sig = dbus_message_new_signal(path, "org.freedesktop.atspi.Accessible", name);
+  sig = dbus_message_new_signal(path, SPI_DBUS_INTERFACE_ACCESSIBLE, name);
   if (!detail) detail = "";
   if (sig)
     {
@@ -910,12 +916,12 @@ spi_init_keystroke_from_atk_key_event (Accessibility_DeviceEvent  *keystroke,
 
 static gboolean Accessibility_DeviceEventController_notifyListenersSync(const Accessibility_DeviceEvent *key_event)
 {
-  DBusMessage *message = dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_REGISTRY, "org.freedesktop.atspi.DeviceEventController", "notifyListenersSync");
+  DBusMessage *message = dbus_message_new_method_call(SPI_DBUS_NAME_REGISTRY, SPI_DBUS_PATH_REGISTRY, SPI_DBUS_INTERFACE_DEC);
   DBusError error;
   dbus_bool_t consumed = FALSE;
 
   dbus_error_init(&error);
-  if (spi_dbus_marshall_deviceEvent(message, key_event))
+  if (spi_dbus_marshal_deviceEvent(message, key_event))
   {
     DBusMessage *reply = dbus_connection_send_with_reply_and_block(this_app->droute.bus, message, 1000, &error);
     if (reply)