2008-07-23 Mark Doffman <mark.doffman@codethink.co.uk>

	* registryd/
	Remove remnants of CORBA implementation. Including
	server description, and setting the IOR on the XDisplay.

diff --git a/registryd/Accessibility_Registry.server.in.in b/registryd/Accessibility_Registry.server.in.in
deleted file mode 100644 (file)
index 8c3b262..0000000
--- a/registryd/Accessibility_Registry.server.in.in
+++ /dev/null
@@ -1,12 +0,0 @@
-<oaf_info>
-       <oaf_server iid="OAFIID:Accessibility_Registry:1.0"
-                   type="exe" location="@REGISTRYD_PATH@/at-spi-registryd">
-               <oaf_attribute name="repo_ids" type="stringv">
-                       <item value="IDL:Bonobo/Unknown:1.0"/>
-                       <item value="IDL:Accessibility/Registry:1.0"/>
-               </oaf_attribute>
-               <oaf_attribute name="name" type="string" _value="AT-SPI Registry"/>
-               <oaf_attribute name="description" type="string"
-                _value="Accessibility Registry"/>
-       </oaf_server>
-</oaf_info>

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index d4c280e..84e97be 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -21,82 +21,62 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef AT_SPI_DEBUG
 #include <stdlib.h>
-#endif
-
 #include <config.h>
 #include <string.h>
-#include <gdk/gdkx.h>
 #include <glib/gmain.h>
 
 #include <spi-common/spi-dbus.h>
 
 #include "registry.h"
 
-#define spi_get_display() GDK_DISPLAY()
+static gchar *dbus_name = NULL;
 
-static void registry_set_ior (SpiRegistry *registry);
+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)
 {
-  int          ret;
-  char        *obj_id;
-  const char  *display_name;
-  char        *cp, *dp;
   SpiRegistry *registry;
-  DBusError error;
   GMainLoop *mainloop;
+  GOptionContext *opt;
+
+  GError *err = NULL;
+  DBusError error;
+  int ret;
 
   g_type_init();
 
-  obj_id = "OAFIID:Accessibility_Registry:1.0";
+  /*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 ();
 
-  display_name = g_getenv ("AT_SPI_DISPLAY");
-  if (!display_name)
-  {
-      display_name = g_getenv ("DISPLAY");
-      cp = strrchr (display_name, '.');
-      dp = strrchr (display_name, ':');
-      if (cp && dp && (cp > dp)) *cp = '\0';
-  }
+  mainloop = g_main_loop_new (NULL, FALSE);
 
   dbus_error_init (&error);
-  mainloop = g_main_loop_new (NULL, FALSE);
-  ret= dbus_bus_request_name(registry->droute.bus, SPI_DBUS_NAME_REGISTRY, DBUS_NAME_FLAG_DO_NOT_QUEUE, &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)
     {
-#ifdef AT_SPI_DEBUG
-      fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");
-#endif
+      g_error("Could not obtain D-Bus name - %s\n", dbus_name);
     }
   else
     {
-#ifdef AT_SPI_DEBUG
-      fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
-#endif
-      registry_set_ior (registry);
+      g_print ("SpiRegistry daemon is running with well-known name - %s\n", dbus_name);
       g_main_loop_run (mainloop);
     }
 
   return 0;
 }
-
-static void
-registry_set_ior (SpiRegistry *registry){
-  Atom  AT_SPI_IOR = XInternAtom (spi_get_display (), "AT_SPI_IOR", FALSE);
-  char *iorstring = NULL;
-
-  iorstring = SPI_DBUS_NAME_REGISTRY;
-
-  XChangeProperty (spi_get_display(),
-                  XDefaultRootWindow (spi_get_display ()),
-                  AT_SPI_IOR, (Atom) 31, 8,
-                  PropModeReplace,
-                  (unsigned char *) iorstring,
-                  iorstring ? strlen (iorstring) : 0);
-}