Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute

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

diff --git a/libspi/introspectable.c b/libspi/introspectable.c
index eb6d7d9..3ce29c3 100644 (file)
--- a/libspi/introspectable.c
+++ b/libspi/introspectable.c
@@ -21,9 +21,10 @@
  */
 
 #include <glib.h>
-#include <dbus.h>
+#include <accessible.h>
 
 #include "droute.h"
+#include "introspect-loader.h"
 
 /*
  * This file contains an implementation of the D-Bus introspectable interface.
@@ -31,61 +32,8 @@
  */
 
 /*
- * Provides the dist install path for the introspection directory.
- */
-#if !defined ATSPI_DBUS_INTROSPECTION_DIRECTORY
-    #error "No introspection XML directory defined"
-#endif
-
-char *spi_introspection_directory = ATSPI_DBUS_INTROSPECTION_DIRECTORY;
-
-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>";
-
-void
-spi_initialize_introspectable (DRouteData *data);
-
-static void
-append_interface (GString *str, const char *interface)
-{
-  char *filename;
-  char *contents;
-  gsize len;
-
-  GError *err = NULL;
-
-  filename = g_build_filename(spi_introspection_directory, interface, NULL);
-
-  if (g_file_get_contents(filename, &contents, &len, &err))
-    {
-      g_string_append_len(str, contents, len);
-    }
-  else
-    {
-      g_warning("AT-SPI: Cannot find introspection XML file %s - %s",
-               filename, err->message);
-      g_error_free(err);
-    }
-
-  g_string_append(str, "\n");
-  g_free(filename);
-  g_free(contents);
-}
-
-/*
- * There is an installation directory with files containing introspection xml.
- * Each file is named after the interface it describes.
- *
  * This function finds the names of each interface that the ATK object supports
- * and mem copies the introspection data from the file into the message.
- *
- * TODO - There could be some wicked caching here, but probably not neccessary.
+ * and appends the introspection XML for each interface.
  */
 static DBusMessage *
 impl_introspect (DBusConnection *bus, DBusMessage *message,
@@ -101,49 +49,49 @@ impl_introspect (DBusConnection *bus, DBusMessage *message,
   path = dbus_message_get_path(message);
   object = spi_dbus_get_object(path);
 
-  output = g_string_new(introspection_header);
+  output = g_string_new(spi_introspection_header);
   
-  g_string_append_printf(output, introspection_node_element, path);
+  g_string_append_printf(output, spi_introspection_node_element, path);
 
   if (ATK_IS_ACTION (object))
-      append_interface(output, "org.freedesktop.atspi.Action");
+      spi_append_interface(output, "org.freedesktop.atspi.Action");
 
   if (ATK_IS_COMPONENT (object))
-      append_interface(output, "org.freedesktop.atspi.Component");
+      spi_append_interface(output, "org.freedesktop.atspi.Component");
 
   if (ATK_IS_EDITABLE_TEXT (object))
-      append_interface(output, "org.freedesktop.atspi.EditableText");
+      spi_append_interface(output, "org.freedesktop.atspi.EditableText");
   else if (ATK_IS_TEXT (object))
-      append_interface(output, "org.freedesktop.atspi.Text");
+      spi_append_interface(output, "org.freedesktop.atspi.Text");
 
   if (ATK_IS_HYPERTEXT (object))
-      append_interface(output, "org.freedesktop.atspi.Hypertext");
+      spi_append_interface(output, "org.freedesktop.atspi.Hypertext");
 
   if (ATK_IS_IMAGE (object))
-      append_interface(output, "org.freedesktop.atspi.Image");
+      spi_append_interface(output, "org.freedesktop.atspi.Image");
 
   if (ATK_IS_SELECTION (object))
-      append_interface(output, "org.freedesktop.atspi.Selection");
+      spi_append_interface(output, "org.freedesktop.atspi.Selection");
 
   if (ATK_IS_TABLE (object))
-      append_interface(output, "org.freedesktop.atspi.Table");
+      spi_append_interface(output, "org.freedesktop.atspi.Table");
 
   if (ATK_IS_VALUE (object))
-      append_interface(output, "org.freedesktop.atspi.Value");
+      spi_append_interface(output, "org.freedesktop.atspi.Value");
 
   if (ATK_IS_STREAMABLE_CONTENT (object))
-      append_interface(output, "org.freedesktop.atspi.StreamableContent");
+      spi_append_interface(output, "org.freedesktop.atspi.StreamableContent");
 
   if (ATK_IS_DOCUMENT (object))
     {
-      append_interface(output, "org.freedesktop.atspi.Collection");
-      append_interface(output, "org.freedesktop.atspi.Document");
+      spi_append_interface(output, "org.freedesktop.atspi.Collection");
+      spi_append_interface(output, "org.freedesktop.atspi.Document");
     }
 
   if (ATK_IS_HYPERLINK_IMPL (object))
-      append_interface(output, "org.freedesktop.atspi.Hyperlink");
+      spi_append_interface(output, "org.freedesktop.atspi.Hyperlink");
 
-  g_string_append(output, introspection_footer);
+  g_string_append(output, spi_introspection_footer);
   final = g_string_free(output, FALSE);
 
   reply = dbus_message_new_method_return (message);
@@ -166,7 +114,7 @@ static DRouteMethod methods[] = {
 void
 spi_initialize_introspectable (DRouteData *data)
 {
-  droute_add_interface (data, "org.freedesktop.atspi.Accessible",
+  droute_add_interface (data, "org.freedesktop.atspi.Introspectable",
                        methods, NULL,
                        (DRouteGetDatumFunction) spi_dbus_get_path, NULL);
 };