2008-07-23 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 880c006..84e97be 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,48 +21,62 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef AT_SPI_DEBUG
 #include <stdlib.h>
-#endif
-
-#include <libbonobo.h>
+#include <config.h>
+#include <string.h>
 #include <glib/gmain.h>
+
+#include <spi-common/spi-dbus.h>
+
 #include "registry.h"
 
+static gchar *dbus_name = NULL;
+
+static GOptionEntry optentries[] = 
+{
+  {"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL},
+  {NULL}
+};
+
 int
-main (int argc,
-      char **argv)
+main (int argc, char **argv)
 {
-        Registry *registry;
-       GSource *keyevent_source;
-        char *obj_id;
-
-        if (!bonobo_init (&argc, argv))
-          {
-            g_error ("Could not initialize oaf / Bonobo");
-          }
-
-        obj_id = "OAFIID:Accessibility_Registry:proto0.1";
-
-        registry = registry_new ();
-
-        bonobo_activation_active_server_register (
-                obj_id,
-                bonobo_object_corba_objref (bonobo_object (registry)));
-
-#ifdef AT_SPI_DEBUG
-        fprintf (stderr, "Registry Message: Registry daemon is running.\n");
-#endif
-  
-        gdk_init(&argc, &argv);
-       g_idle_add (registry->kbd_event_hook, registry);
-/*     keyevent_source =
-               g_source_new (registry->kbd_event_hook, sizeof (GSourceFunc));
-               g_source_attach (keyevent_source, g_main_context_default());*/
-        bonobo_main ();
-
-        return 0;
-}
+  SpiRegistry *registry;
+  GMainLoop *mainloop;
+  GOptionContext *opt;
+
+  GError *err = NULL;
+  DBusError error;
+  int ret;
 
+  g_type_init();
 
+  /*Parse command options*/
+  opt = g_option_context_new(NULL);
+  g_option_context_add_main_entries(opt, optentries, NULL);
 
+  if (!g_option_context_parse(opt, &argc, &argv, &err))
+      g_error("Option parsing failed: %s\n", err->message);
+
+  if (dbus_name == NULL)
+      dbus_name = SPI_DBUS_NAME_REGISTRY;
+
+  registry = spi_registry_new ();
+
+  mainloop = g_main_loop_new (NULL, FALSE);
+
+  dbus_error_init (&error);
+  ret = dbus_bus_request_name(registry->droute.bus, dbus_name, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);
+
+  if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
+    {
+      g_error("Could not obtain D-Bus name - %s\n", dbus_name);
+    }
+  else
+    {
+      g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
+      g_main_loop_run (mainloop);
+    }
+
+  return 0;
+}