Use macros for interface names

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

diff --git a/atk-adaptor/introspectable.c b/atk-adaptor/introspectable.c
index 4909e30..4781979 100644 (file)
--- a/atk-adaptor/introspectable.c
+++ b/atk-adaptor/introspectable.c
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <accessible.h>
 
-#include "droute/droute.h"
-#include "droute/introspect-loader.h"
+#include <droute/droute.h>
+#include <droute/introspect-loader.h>
 
 /*
  * This file contains an implementation of the D-Bus introspectable interface.
@@ -53,31 +53,34 @@ impl_introspect (DBusConnection *bus, DBusMessage *message,
   
   g_string_append_printf(output, spi_introspection_node_element, path);
 
+  spi_append_interface(output, SPI_DBUS_INTERFACE_ACCESSIBLE);
+
   if (ATK_IS_ACTION (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Action");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_ACTION);
 
   if (ATK_IS_COMPONENT (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Component");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_COMPONENT);
 
   if (ATK_IS_EDITABLE_TEXT (object))
-      spi_append_interface(output, "org.freedesktop.atspi.EditableText");
-  else if (ATK_IS_TEXT (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Text");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_EDITABLE_TEXT);
+
+  if (ATK_IS_TEXT (object))
+      spi_append_interface(output, SPI_DBUS_INTERFACE_TEXT);
 
   if (ATK_IS_HYPERTEXT (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Hypertext");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_HYPERTEXT);
 
   if (ATK_IS_IMAGE (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Image");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_IMAGE);
 
   if (ATK_IS_SELECTION (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Selection");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_SELECTION);
 
   if (ATK_IS_TABLE (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Table");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_TABLE);
 
   if (ATK_IS_VALUE (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Value");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_VALUE);
 
   if (ATK_IS_STREAMABLE_CONTENT (object))
       spi_append_interface(output, "org.freedesktop.atspi.StreamableContent");
@@ -85,11 +88,11 @@ impl_introspect (DBusConnection *bus, DBusMessage *message,
   if (ATK_IS_DOCUMENT (object))
     {
       spi_append_interface(output, "org.freedesktop.atspi.Collection");
-      spi_append_interface(output, "org.freedesktop.atspi.Document");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_DOCUMENT);
     }
 
   if (ATK_IS_HYPERLINK_IMPL (object))
-      spi_append_interface(output, "org.freedesktop.atspi.Hyperlink");
+      spi_append_interface(output, SPI_DBUS_INTERFACE_HYPERLINK);
 
   g_string_append(output, spi_introspection_footer);
   final = g_string_free(output, FALSE);
@@ -112,9 +115,9 @@ static DRouteMethod methods[] = {
  * Adds the introspectable interface to the DRoute object provided
  */
 void
-spi_initialize_introspectable (DRouteData *data)
+spi_initialize_introspectable (DRouteData *data, DRouteGetDatumFunction verify_object)
 {
-  droute_add_interface (data, "org.freedesktop.atspi.Introspectable",
+  droute_add_interface (data, "org.freedesktop.DBus.Introspectable",
                        methods, NULL,
-                       (DRouteGetDatumFunction) spi_dbus_get_path, NULL);
+                       verify_object, NULL);
 };