2009-06-11 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index dd42775..3b738af 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -27,8 +27,14 @@
 #include <glib/gmain.h>
 
 #include <spi-common/spi-dbus.h>
+#include <droute/droute.h>
 
 #include "registry.h"
+#include "deviceeventcontroller.h"
+
+#if !defined ATSPI_INTROSPECTION_PATH
+    #error "No introspection XML directory defined"
+#endif
 
 static gchar *dbus_name = NULL;
 
@@ -42,7 +48,9 @@ int
 main (int argc, char **argv)
 {
   SpiRegistry *registry;
-  /*SpiDEController *dec;*/
+  SpiDEController *dec;
+  DRouteContext *droute;
+  gchar *introspection_directory;
 
   GMainLoop *mainloop;
   DBusConnection *bus;
@@ -55,6 +63,9 @@ main (int argc, char **argv)
 
   g_type_init();
 
+  /* We depend on GDK as well as XLib for device event processing */
+  gdk_init(&argc, &argv);
+
   /*Parse command options*/
   opt = g_option_context_new(NULL);
   g_option_context_add_main_entries(opt, optentries, NULL);
@@ -85,8 +96,16 @@ main (int argc, char **argv)
       g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
     }
 
-  /*dec = spi_registry_dec_new (bus);*/
-  registry = spi_registry_new (bus);
+  /* Get D-Bus introspection directory */
+  introspection_directory = (char *) g_getenv("ATSPI_INTROSPECTION_PATH");
+  if (introspection_directory == NULL)
+      introspection_directory = ATSPI_INTROSPECTION_PATH;
+
+  /* Set up D-Route for use by the dec */
+  droute = droute_new (bus, introspection_directory);
+
+  registry = spi_registry_new (bus, droute);
+  dec = spi_registry_dec_new (registry, bus, droute);
 
   g_main_loop_run (mainloop);
   return 0;