*** empty log message ***

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

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 1089017..2c72844 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
@@ -24,40 +25,60 @@
 #include <stdlib.h>
 #endif
 
+#include <gdk/gdk.h>
 #include <libbonobo.h>
 #include <glib/gmain.h>
 #include "registry.h"
 
 int
-main (int argc,
-      char **argv)
+main (int argc, char **argv)
 {
-        SpiRegistry *registry;
-       GSource *keyevent_source;
-        char *obj_id;
+  int          ret;
+  char        *obj_id, *display_name;
+  char        *cp, *dp;
+  SpiRegistry *registry;
+  GSList      *reg_env = NULL;
 
-        if (!bonobo_init (&argc, argv))
-          {
-            g_error ("Could not initialize oaf / Bonobo");
-          }
+  if (!bonobo_init (&argc, argv))
+    {
+      g_error ("Could not initialize oaf / Bonobo");
+    }
 
-        obj_id = "OAFIID:Accessibility_Registry:proto0.1";
+  obj_id = "OAFIID:Accessibility_Registry:1.0";
 
-        registry = spi_registry_new ();
+  registry = spi_registry_new ();
 
-        bonobo_activation_active_server_register (
-                obj_id,
-                bonobo_object_corba_objref (bonobo_object (registry)));
+  display_name = g_getenv ("AT_SPI_DISPLAY");
+  if (!display_name)
+  {
+      display_name = g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+      cp = strrchr (display_name, '.');
+      dp = strrchr (display_name, ':');
+      if (cp && dp && ((guint) cp > (guint) dp)) *cp = '\0';
+  }
 
+  reg_env = bonobo_activation_registration_env_set ( reg_env, "AT_SPI_DISPLAY", 
+                                                    display_name);
+  ret = bonobo_activation_register_active_server (
+         obj_id,
+         bonobo_object_corba_objref (bonobo_object (registry)),
+         reg_env);
+  bonobo_activation_registration_env_free (reg_env);
+
+  if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
+    {
+#ifdef AT_SPI_DEBUG
+      fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");
+#endif
+    }
+  else
+    {
 #ifdef AT_SPI_DEBUG
-        fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
+      fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
 #endif
-  
-        g_timeout_add_full (G_PRIORITY_HIGH_IDLE, 200, registry->kbd_event_hook, registry, NULL);
-        bonobo_main ();
+      bonobo_main ();
+    }
 
-        return 0;
+  return 0;
 }
 
-
-