{
static int replies_received = 0;
+ if (!spi_global_app_data)
+ return;
+
replies_received++;
if (replies_received == 3)
{
DBusMessage *reply = dbus_pending_call_steal_reply (pending);
DBusMessageIter iter, iter_array, iter_struct;
- if (!reply)
+ if (!reply || !spi_global_app_data)
goto done;
if (strcmp (dbus_message_get_signature (reply), "a(ss)") != 0)
reply = dbus_pending_call_steal_reply (pending);
dbus_pending_call_unref (pending);
+
+ if (!spi_global_app_data)
+ {
+ if (reply)
+ dbus_message_unref (reply);
+ return;
+ }
+
if (reply)
{
gchar *app_name, *obj_path;
dbus_message_iter_next (&iter_struct);
dbus_message_iter_get_basic (&iter_struct, &obj_path);
+ g_free (app->desktop_name);
app->desktop_name = g_strdup (app_name);
+ g_free (app->desktop_path);
app->desktop_path = g_strdup (obj_path);
}
}
}
dbus_message_unref (reply);
- get_registered_event_listeners (spi_global_app_data);
+ if (!spi_global_app_data->events_initialized)
+ get_registered_event_listeners (spi_global_app_data);
}
static gboolean
{
DBusMessage *message;
DBusMessageIter iter;
- DBusError error;
DBusPendingCall *pending;
- dbus_error_init (&error);
+ g_free (app->desktop_name);
+ g_free (app->desktop_path);
/* These will be overridden when we get a reply, but in practice these
defaults should always be correct */
- app->desktop_name = ATSPI_DBUS_NAME_REGISTRY;
- app->desktop_path = ATSPI_DBUS_PATH_ROOT;
+ app->desktop_name = g_strdup (ATSPI_DBUS_NAME_REGISTRY);
+ app->desktop_path = g_strdup (ATSPI_DBUS_PATH_ROOT);
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
ATSPI_DBUS_PATH_ROOT,
if (!dbus_connection_send_with_reply (app->bus, message, &pending, -1)
|| !pending)
{
+ if (pending)
+ dbus_pending_call_unref (pending);
+
+ dbus_message_unref (message);
return FALSE;
}
{
DBusMessage *message;
DBusMessageIter iter;
- DBusError error;
const char *uname;
- dbus_error_init (&error);
-
message = dbus_message_new_method_call (SPI_DBUS_NAME_REGISTRY,
ATSPI_DBUS_PATH_REGISTRY,
ATSPI_DBUS_INTERFACE_REGISTRY,
g_free (app->app_tmp_dir);
app->app_tmp_dir = NULL;
}
+
+ g_free (app->desktop_name);
+ app->desktop_name = NULL;
+ g_free (app->desktop_path);
+ app->desktop_path = NULL;
}
/*---------------------------------------------------------------------------*/
static void
socket_embed_hook (AtkSocket * socket, gchar * plug_id)
{
+ g_return_if_fail (spi_global_register != NULL);
+
AtkObject *accessible = ATK_OBJECT(socket);
gchar *plug_name, *plug_path;
AtkObjectClass *klass;
spi_event_is_subtype (evdata->data, remove_data))
{
GList *events = spi_global_app_data->events;
- list = list->next;
g_strfreev (evdata->data);
g_free (evdata->bus_name);
g_free (evdata);
- spi_global_app_data->events = g_list_remove (events, evdata);
+ if (list->prev)
+ {
+ GList *next = list->next;
+ list->prev = g_list_remove (list->prev, evdata);
+ list = next;
+ }
+ else
+ {
+ spi_global_app_data->events = g_list_remove (events, evdata);
+ list = spi_global_app_data->events;
+ }
}
else
{
const char *interface = dbus_message_get_interface (message);
const char *member = dbus_message_get_member (message);
DBusHandlerResult result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ static gboolean registry_lost = FALSE;
if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
!g_strcmp0(member, "NameOwnerChanged"))
{
char *name, *old, *new;
- result = DBUS_HANDLER_RESULT_HANDLED;
if (dbus_message_get_args (message, NULL,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_STRING, &old,
DBUS_TYPE_STRING, &new,
DBUS_TYPE_INVALID))
{
- if (*old != '\0' && *new == '\0')
+ if (!strcmp (name, "org.a11y.atspi.Registry"))
+ {
+ if (registry_lost && !old[0])
+ {
+ register_application (spi_global_app_data);
+ registry_lost = FALSE;
+ }
+ else if (!new[0])
+ registry_lost = TRUE;
+ }
+ else if (*old != '\0' && *new == '\0')
spi_atk_remove_client (old);
}
}
{
#ifndef DISABLE_P2P
DBusServer *server;
- DBusError err;
+ DBusError error;
if (getuid () != 0)
{
if (!spi_global_app_data->app_bus_addr)
return -1;
- dbus_error_init(&err);
- server = dbus_server_listen(spi_global_app_data->app_bus_addr, &err);
+ dbus_error_init(&error);
+ server = dbus_server_listen(spi_global_app_data->app_bus_addr, &error);
if (server == NULL)
{
- g_warning ("atk-bridge: Couldn't listen on dbus server: %s", err.message);
- dbus_error_init (&err);
+ g_warning ("atk-bridge: Couldn't listen on dbus server: %s", error.message);
+ dbus_error_free (&error);
spi_global_app_data->app_bus_addr [0] = '\0';
g_main_context_unref (spi_global_app_data->main_context);
spi_global_app_data->main_context = NULL;
return TRUE;
}
+void
+spi_atk_activate ()
+{
+ DRoutePath *treepath;
+
+ spi_atk_register_event_listeners ();
+ if (!spi_global_cache)
+ {
+ spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL);
+ treepath = droute_add_one (spi_global_app_data->droute,
+ "/org/a11y/atspi/cache", spi_global_cache);
+
+ if (!treepath)
+ {
+ g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
+ return;
+ }
+ spi_initialize_cache (treepath);
+ if (spi_global_app_data->bus)
+ droute_path_register (treepath, spi_global_app_data->bus);
+ }
+}
+
/*
* spi_app_init
*
DBusError error;
AtkObject *root;
gboolean load_bridge;
- DRoutePath *treepath, *accpath;
+ DRoutePath *accpath;
load_bridge = check_envvar ();
if (inited && !load_bridge)
g_option_context_add_main_entries (opt, atspi_option_entries, NULL);
g_option_context_set_ignore_unknown_options (opt, TRUE);
if (!g_option_context_parse (opt, argc, argv, &err))
- g_warning ("AT-SPI Option parsing failed: %s\n", err->message);
+ {
+ g_warning ("AT-SPI Option parsing failed: %s\n", err->message);
+ g_error_free (err);
+ }
g_option_context_free (opt);
/* Allocate global data and do ATK initializations */
*/
spi_global_register = g_object_new (SPI_REGISTER_TYPE, NULL);
spi_global_leasing = g_object_new (SPI_LEASING_TYPE, NULL);
- spi_global_cache = g_object_new (SPI_CACHE_TYPE, NULL);
/* Register droute for routing AT-SPI messages */
spi_global_app_data->droute =
droute_new ();
- treepath = droute_add_one (spi_global_app_data->droute,
- "/org/a11y/atspi/cache", spi_global_cache);
-
- if (!treepath)
- {
- g_warning ("atk-bridge: Error in droute_add_one(). Already running?");
- return -1;
- }
-
accpath = droute_add_many (spi_global_app_data->droute,
"/org/a11y/atspi/accessible",
NULL,
/* Register all interfaces with droute and set up application accessible db */
- spi_initialize_cache (treepath);
spi_initialize_accessible (accpath);
spi_initialize_application (accpath);
spi_initialize_action (accpath);
/* Register methods to send D-Bus signals on certain ATK events */
if (clients)
- spi_atk_register_event_listeners ();
+ spi_atk_activate ();
/* Set up filter and match rules to catch signals */
dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.Registry', sender='org.a11y.atspi.Registry'", NULL);
dbus_bus_add_match (spi_global_app_data->bus, "type='signal', interface='org.a11y.atspi.DeviceEventListener', sender='org.a11y.atspi.Registry'", NULL);
+ dbus_bus_add_match (spi_global_app_data->bus, "type='signal', arg0='org.a11y.atspi.Registry', interface='org.freedesktop.DBus', member='NameOwnerChanged'", NULL);
dbus_connection_add_filter (spi_global_app_data->bus, signal_filter, NULL,
NULL);
else
get_registered_event_listeners (spi_global_app_data);
+ dbus_error_free (&error);
return 0;
}
GList *l;
GSList *ls;
- g_return_if_fail (inited);
+ if (!inited)
+ return;
if (!spi_global_app_data)
return;
{
dbus_connection_remove_filter (spi_global_app_data->bus, signal_filter, NULL);
droute_context_unregister (spi_global_app_data->droute, spi_global_app_data->bus);
+ dbus_connection_close (spi_global_app_data->bus);
dbus_connection_unref (spi_global_app_data->bus);
+ spi_global_app_data->bus = NULL;
}
for (l = spi_global_app_data->direct_connections; l; l = l->next)
droute_context_unregister (spi_global_app_data->droute, connection);
droute_unintercept_dbus (connection);
+ dbus_connection_close (connection);
dbus_connection_unref (connection);
}
g_list_free (spi_global_app_data->direct_connections);
+ spi_global_app_data->direct_connections = NULL;
for (ls = clients; ls; ls = ls->next)
- g_free (l->data);
+ g_free (ls->data);
g_slist_free (clients);
clients = NULL;
- g_object_unref (spi_global_cache);
- g_object_unref (spi_global_leasing);
- g_object_unref (spi_global_register);
+ g_clear_object (&spi_global_cache);
+ g_clear_object (&spi_global_leasing);
+ g_clear_object (&spi_global_register);
if (spi_global_app_data->main_context)
g_main_context_unref (spi_global_app_data->main_context);
return;
}
if (!clients)
- spi_atk_register_event_listeners ();
+ spi_atk_activate ();
clients = g_slist_append (clients, g_strdup (bus_name));
match = g_strdup_printf (name_match_tmpl, bus_name);
dbus_bus_add_match (spi_global_app_data->bus, match, NULL);
clients = g_slist_delete_link (clients, l);
if (!clients)
spi_atk_deregister_event_listeners ();
+ return;
}
l = next_node;