return bus;
}
+static void
+set_reply (DBusPendingCall *pending, void *user_data)
+{
+ void **replyptr = (void **)user_data;
+
+ *replyptr = dbus_pending_call_steal_reply (pending);
+}
+
+static DBusMessage *
+send_and_allow_reentry (DBusConnection *bus, DBusMessage *message, DBusError *error)
+{
+ DBusPendingCall *pending;
+ DBusMessage *reply = NULL;
+
+ if (!dbus_connection_send_with_reply (bus, message, &pending, -1))
+ {
+ return NULL;
+ }
+ dbus_pending_call_set_notify (pending, set_reply, (void *)&reply, NULL);
+ while (!reply)
+ {
+ if (!dbus_connection_read_write_dispatch (bus, -1)) return NULL;
+ }
+ return reply;
+}
/*---------------------------------------------------------------------------*/
-static void
+static gboolean
register_application (SpiBridge * app)
{
DBusMessage *message, *reply;
dbus_message_iter_init_append (message, &iter);
spi_object_append_reference (&iter, app->root);
-
- reply = dbus_connection_send_with_reply_and_block (app->bus, message, -1, &error);
+
+ reply = send_and_allow_reentry (app->bus, message, &error);
if (message)
dbus_message_unref (message);
DBusMessageIter iter, iter_struct;
gchar *app_name, *obj_path;
+ if (strcmp (dbus_message_get_signature (reply), "(so)") != 0)
+ {
+ g_warning ("AT-SPI: Could not obtain desktop path or name\n");
+ return FALSE;
+ }
+
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_struct);
- if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_STRING))
- g_error ("AT-SPI: Could not obtain desktop path or name\n");
dbus_message_iter_get_basic (&iter_struct, &app_name);
- if (!dbus_message_iter_next (&iter_struct))
- g_error ("AT-SPI: Could not obtain desktop name");
- if (!(dbus_message_iter_get_arg_type (&iter_struct) == DBUS_TYPE_OBJECT_PATH))
- g_error ("AT-SPI: Could not obtain desktop path");
+ dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, &obj_path);
app->desktop_name = g_strdup (app_name);
}
else
{
- g_error ("AT-SPI: Could not embed inside desktop: %s\n", error.message);
+ g_warning ("AT-SPI: Could not embed inside desktop: %s\n", error.message);
+ return FALSE;
}
-
+ return TRUE;
}
/*---------------------------------------------------------------------------*/
{
DBusMessage *message;
*(plug_path++) = '\0';
- message = dbus_message_new_method_call (plug_name, plug_path, "org.freedesktop.atspi.Accessible", "Embedded");
+ message = dbus_message_new_method_call (plug_name, plug_path, SPI_DBUS_INTERFACE_SOCKET, "Embedded");
dbus_message_append_args (message, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID);
dbus_connection_send (spi_global_app_data->bus, message, NULL);
}
dbus_connection_setup_with_g_main (spi_global_app_data->bus,
g_main_context_default ());
+ /* Hook our plug-and socket functions */
+ install_plug_hooks ();
+
/*
* Create the leasing, register and cache objects.
* The order is important here, the cache depends on the
treepath = droute_add_one (spi_global_app_data->droute,
"/org/at_spi/cache", spi_global_cache);
+ if (!treepath)
+ {
+ g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
+ return 0;
+ }
+
accpath = droute_add_many (spi_global_app_data->droute,
- "/org/freedesktop/atspi/accessible",
+ "/org/a11y/atspi/accessible",
NULL,
(DRouteGetDatumFunction)
spi_global_register_path_to_object);
spi_initialize_hypertext (accpath);
spi_initialize_image (accpath);
spi_initialize_selection (accpath);
+ spi_initialize_socket (accpath);
spi_initialize_table (accpath);
spi_initialize_text (accpath);
spi_initialize_value (accpath);
/* Register methods to send D-Bus signals on certain ATK events */
spi_atk_register_event_listeners ();
- /* Hook our plug-and socket functions */
- install_plug_hooks ();
-
/* Register this app by sending a signal out to AT-SPI registry daemon */
- if (!atspi_no_register)
+ if (!atspi_no_register && (!root || !ATK_IS_PLUG (root)))
register_application (spi_global_app_data);
g_atexit (exit_func);