Add .po and .pc files from cspi

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

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index c43c6dc..d4c280e 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -28,8 +28,10 @@
 #include <config.h>
 #include <string.h>
 #include <gdk/gdkx.h>
-#include <libbonobo.h>
 #include <glib/gmain.h>
+
+#include <spi-common/spi-dbus.h>
+
 #include "registry.h"
 
 #define spi_get_display() GDK_DISPLAY()
@@ -44,11 +46,10 @@ main (int argc, char **argv)
   const char  *display_name;
   char        *cp, *dp;
   SpiRegistry *registry;
+  DBusError error;
+  GMainLoop *mainloop;
 
-  if (!bonobo_init (&argc, argv))
-    {
-      g_error ("Could not initialize oaf / Bonobo");
-    }
+  g_type_init();
 
   obj_id = "OAFIID:Accessibility_Registry:1.0";
 
@@ -63,14 +64,11 @@ main (int argc, char **argv)
       if (cp && dp && (cp > dp)) *cp = '\0';
   }
 
-  ret = bonobo_activation_register_active_server (
-         obj_id,
-         bonobo_object_corba_objref (bonobo_object (registry)),
-         NULL);
-
-  registry_set_ior (registry);
+  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);
 
-  if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
+  if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)
     {
 #ifdef AT_SPI_DEBUG
       fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");
@@ -81,7 +79,8 @@ main (int argc, char **argv)
 #ifdef AT_SPI_DEBUG
       fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon is running.\n");
 #endif
-      bonobo_main ();
+      registry_set_ior (registry);
+      g_main_loop_run (mainloop);
     }
 
   return 0;
@@ -89,15 +88,10 @@ main (int argc, char **argv)
 
 static void
 registry_set_ior (SpiRegistry *registry){
-  CORBA_Environment ev;
   Atom  AT_SPI_IOR = XInternAtom (spi_get_display (), "AT_SPI_IOR", FALSE);
   char *iorstring = NULL;
 
-  CORBA_exception_init (&ev);
-
-  iorstring = CORBA_ORB_object_to_string (bonobo_activation_orb_get (),
-                                     bonobo_object_corba_objref (bonobo_object (registry)),
-                                     &ev);
+  iorstring = SPI_DBUS_NAME_REGISTRY;
 
   XChangeProperty (spi_get_display(),
                   XDefaultRootWindow (spi_get_display ()),
@@ -105,14 +99,4 @@ registry_set_ior (SpiRegistry *registry){
                   PropModeReplace,
                   (unsigned char *) iorstring,
                   iorstring ? strlen (iorstring) : 0);
-
-  if (ev._major != CORBA_NO_EXCEPTION)
-         {
-                 g_error ("Error setting IOR %s",
-                          CORBA_exception_id (&ev));
-                  CORBA_exception_free (&ev);
-           }
-
-  CORBA_exception_free (&ev);
-
 }