* Boston, MA 02111-1307, USA.
*/
-#ifdef AT_SPI_DEBUG
#include <stdlib.h>
-#endif
-
#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()
+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;
+ GMainLoop *mainloop;
+ GOptionContext *opt;
- if (!bonobo_init (&argc, argv))
- {
- g_error ("Could not initialize oaf / Bonobo");
- }
+ 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);
- obj_id = "OAFIID:Accessibility_Registry:1.0";
+ 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';
- }
-
- ret = bonobo_activation_register_active_server (
- obj_id,
- bonobo_object_corba_objref (bonobo_object (registry)),
- NULL);
-
- if (ret != Bonobo_ACTIVATION_REG_SUCCESS)
+ 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)
{
-#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);
- bonobo_main ();
+ 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){
- 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);
-
- XChangeProperty (spi_get_display(),
- XDefaultRootWindow (spi_get_display ()),
- AT_SPI_IOR, (Atom) 31, 8,
- 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);
-
-}