{
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_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 */
{
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,
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;
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;
/* 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;
}