Do not start if an instance already owns org.freedesktop.atspi.Registry

diff --git a/registryd/registry-main.c b/registryd/registry-main.c
index 3db50e4..d4c280e 100644 (file)
--- a/registryd/registry-main.c
+++ b/registryd/registry-main.c
@@ -66,9 +66,9 @@ main (int argc, char **argv)
 
   dbus_error_init (&error);
   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, 0, &error);
+  ret= dbus_bus_request_name(registry->droute.bus, SPI_DBUS_NAME_REGISTRY, DBUS_NAME_FLAG_DO_NOT_QUEUE, &error);

 
 

-  if (!ret)
+  if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS)

     {
 #ifdef AT_SPI_DEBUG
       fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");
     {
 #ifdef AT_SPI_DEBUG
       fprintf (stderr, "SpiRegistry Message: SpiRegistry daemon was already running.\n");