+#define CORBA_GCONF_KEY "/desktop/gnome/interface/at-spi-corba"
+
+static gboolean need_to_quit ();
+
+static GMainLoop *mainloop;
+static gchar *dbus_name = NULL;
+static gboolean use_gnome_session = FALSE;
+
+static GOptionEntry optentries[] =
+{
+ {"dbus-name", 0, 0, G_OPTION_ARG_STRING, &dbus_name, "Well-known name to register with D-Bus", NULL},
+ {"use-gnome-session", 0, 0, G_OPTION_ARG_NONE, &use_gnome_session, "Should register with gnome session manager", NULL},
+ {NULL}
+};
+
+static DBusGConnection *bus_connection = NULL;
+static DBusGProxy *sm_proxy = NULL;
+static char *client_id = NULL;
+static DBusGProxy *client_proxy = NULL;
+
+#define SM_DBUS_NAME "org.gnome.SessionManager"
+#define SM_DBUS_PATH "/org/gnome/SessionManager"
+#define SM_DBUS_INTERFACE "org.gnome.SessionManager"
+
+#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate"
+
+static void registry_session_init (const char *previous_client_id, const char *exe);
+
+static gboolean
+session_manager_connect (void)
+{
+
+ if (bus_connection == NULL) {
+ GError *error;
+
+ error = NULL;
+ bus_connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if (bus_connection == NULL) {
+ g_message ("Failed to connect to the session bus: %s",
+ error->message);
+ g_error_free (error);
+ exit (1);
+ }
+ }
+
+ sm_proxy = dbus_g_proxy_new_for_name (bus_connection,
+ SM_DBUS_NAME,
+ SM_DBUS_PATH,
+ SM_DBUS_INTERFACE);
+ return (sm_proxy != NULL);
+}
+
+static void
+kill_accessibility_bus ()
+{
+ FILE *fp;
+ const char *home;
+ char *name;
+ int pid;
+
+ home = getenv ("HOME");
+ if (!home)
+ return;
+ name = g_strconcat (home, "/", ".atspi-dbus-bus.pid", NULL);
+ if (!name)
+ return;
+
+ fp = fopen (name, "r");
+ if (fp)
+ {
+ if (fscanf (fp, "%d", &pid) == 1)
+ {
+ kill (&pid, SIGTERM);
+ }
+ fclose (fp);
+ }
+ g_free (name);
+}
+
+static void
+stop_cb (gpointer data)
+{
+ kill_accessibility_bus ();
+ g_main_loop_quit (mainloop);
+}
+
+static gboolean
+end_session_response (gboolean is_okay, const gchar *reason)
+{
+ gboolean ret;
+ GError *error = NULL;
+
+ ret = dbus_g_proxy_call (client_proxy, "EndSessionResponse",
+ &error,
+ G_TYPE_BOOLEAN, is_okay,
+ G_TYPE_STRING, reason,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+
+ if (!ret) {
+ g_warning ("Failed to send session response %s", error->message);
+ g_error_free (error);
+ }
+
+ return ret;
+}
+
+static void
+query_end_session_cb (guint flags, gpointer data)
+{
+ end_session_response (TRUE, NULL);
+}
+
+static void
+end_session_cb (guint flags, gpointer data)
+{
+ kill_accessibility_bus ();
+ end_session_response (TRUE, NULL);
+ g_main_loop_quit (mainloop);
+}
+static gboolean
+register_client (void)