if (!bus)
atspi_init ();
if (!bus)
- g_error ("AT-SPI: COuldn't connect to accessibility bus. Is at-spi-bus-launcher running?");
+ g_error ("AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?");
return bus;
}
cleanup ()
{
GHashTable *refs;
- GList *l;
+ gint i;
refs = live_refs;
live_refs = NULL;
if (!desktop)
return;
- for (l = desktop->children; l;)
+
+ /* TODO: Do we need this code, or should we just dispose the desktop? */
+ for (i = desktop->children->len - 1; i >= 0; i--)
{
- GList *next = l->next;
- AtspiAccessible *child = l->data;
+ AtspiAccessible *child = g_ptr_array_index (desktop->children, i);
g_object_run_dispose (G_OBJECT (child->parent.app));
g_object_run_dispose (G_OBJECT (child));
- l = next;
}
+
g_object_run_dispose (G_OBJECT (desktop->parent.app));
g_object_unref (desktop);
desktop = NULL;
dbus_connection_unref (app->bus);
}
app->bus = bus;
+ atspi_dbus_connection_setup_with_g_main(bus, g_main_context_default());
}
else
{
- g_warning ("Unable to open bus connection: %s", error.message);
+ if (!strcmp (error.name, DBUS_ERROR_FILE_NOT_FOUND))
+ g_warning ("Unable to open bus connection: %s", error.message);
dbus_error_free (&error);
}
}
"/org/a11y/atspi/cache",
atspi_interface_cache, "GetItems");
- dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000);
- dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL);
+ dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000);
dbus_message_unref (message);
+ if (!new_pending)
+ return;
+ dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL);
}
static AtspiApplication *
message = dbus_message_new_method_call (bus_name, atspi_path_root,
atspi_interface_application, "GetApplicationBusAddress");
- dbus_connection_send_with_reply (app->bus, message, &pending, 2000);
- dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL);
+ dbus_connection_send_with_reply (app->bus, message, &pending, 2000);
dbus_message_unref (message);
+ if (!pending)
+ {
+ g_hash_table_remove (app_hash, bus_name_dup);
+ return NULL;
+ }
+ dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL);
return app;
}
{
app->root = _atspi_accessible_new (app, atspi_path_root);
app->root->accessible_parent = atspi_get_desktop (0);
- app->root->accessible_parent->children = g_list_append (app->root->accessible_parent->children, g_object_ref (app->root));
+ g_ptr_array_add (app->root->accessible_parent->children, g_object_ref (app->root));
}
return g_object_ref (app->root);
}
else if (!new[0])
registry_lost = TRUE;
}
- else
+ else if (app_hash)
{
- AtspiAccessible *desktop = atspi_get_desktop (0);
- GList *l;
- for (l = desktop->children; l; l = l->next)
- {
- AtspiAccessible *child = l->data;
- if (!strcmp (child->parent.app->bus_name, old))
- g_object_run_dispose (G_OBJECT (child->parent.app));
- }
- g_object_unref (desktop);
+ AtspiApplication *app = g_hash_table_lookup (app_hash, old);
+ if (app && !strcmp (app->bus_name, old))
+ g_object_run_dispose (G_OBJECT (app));
}
return DBUS_HANDLER_RESULT_HANDLED;
}
AtspiAccessible *accessible;
const char *name, *description;
dbus_uint32_t role;
+ gboolean children_cached = FALSE;
+ dbus_int32_t count, index;
dbus_message_iter_recurse (iter, &iter_struct);
g_object_unref (accessible->accessible_parent);
accessible->accessible_parent = ref_accessible (app_name, path);
- /* Get children */
- while (accessible->children)
+ if (dbus_message_iter_get_arg_type (&iter_struct) == 'i')
{
- g_object_unref (accessible->children->data);
- accessible->children = g_list_remove (accessible->children, accessible->children->data);
+ /* Get index in parent */
+ dbus_message_iter_get_basic (&iter_struct, &index);
+ if (index >= 0 && accessible->accessible_parent)
+ {
+ if (index >= accessible->accessible_parent->children->len)
+ g_ptr_array_set_size (accessible->accessible_parent->children, index + 1);
+ g_ptr_array_index (accessible->accessible_parent->children, index) = g_object_ref (accessible);
+ }
+
+ /* get child count */
+ dbus_message_iter_next (&iter_struct);
+ dbus_message_iter_get_basic (&iter_struct, &count);
+ if (count >= 0)
+ {
+ g_ptr_array_set_size (accessible->children, count);
+ children_cached = TRUE;
+ }
}
- dbus_message_iter_recurse (&iter_struct, &iter_array);
- while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+ else if (dbus_message_iter_get_arg_type (&iter_struct) == 'a')
{
- AtspiAccessible *child;
- get_reference_from_iter (&iter_array, &app_name, &path);
- child = ref_accessible (app_name, path);
- accessible->children = g_list_append (accessible->children, child);
+ /* It's the old API with a list of children */
+ /* TODO: Perhaps remove this code eventually */
+ dbus_message_iter_recurse (&iter_struct, &iter_array);
+ while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
+ {
+ AtspiAccessible *child;
+ get_reference_from_iter (&iter_array, &app_name, &path);
+ child = ref_accessible (app_name, path);
+ g_ptr_array_remove (accessible->children, child);
+ g_ptr_array_add (accessible->children, child);
+ }
+ children_cached = TRUE;
}
/* interfaces */
_atspi_accessible_add_cache (accessible, ATSPI_CACHE_NAME | ATSPI_CACHE_ROLE |
ATSPI_CACHE_PARENT | ATSPI_CACHE_DESCRIPTION);
if (!atspi_state_set_contains (accessible->states,
- ATSPI_STATE_MANAGES_DESCENDANTS))
+ ATSPI_STATE_MANAGES_DESCENDANTS) &&
+ children_cached)
_atspi_accessible_add_cache (accessible, ATSPI_CACHE_CHILDREN);
/* This is a bit of a hack since the cache holds a ref, so we don't need
{
const char *sender = dbus_message_get_sender (reply);
const char *error = NULL;
- dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error,
- DBUS_TYPE_INVALID);
- g_warning ("AT-SPI: Error in GetItems, sender=%s, error=%s", sender, error);
+ if (!strcmp (dbus_message_get_error_name (reply),
+ DBUS_ERROR_SERVICE_UNKNOWN))
+ {
+ }
+ else
+ {
+ dbus_message_get_args (reply, NULL, DBUS_TYPE_STRING, &error,
+ DBUS_TYPE_INVALID);
+ g_warning ("AT-SPI: Error in GetItems, sender=%s, error=%s", sender, error);
+ }
dbus_message_unref (reply);
dbus_pending_call_unref (pending);
return;
get_reference_from_iter (&iter_array, &app_name, &path);
add_app_to_desktop (desktop, app_name);
}
- dbus_message_unref (reply);
/* Record the alternate name as an alias for org.a11y.atspi.Registry */
bus_name_dup = g_strdup (dbus_message_get_sender (reply));
if (bus_name_dup)
g_hash_table_insert (app_hash, bus_name_dup, app);
+ dbus_message_unref (reply);
+
return g_object_ref (desktop);
}
return ref_hyperlink (app_name, path);
}
-const char *cache_signal_type = "((so)(so)(so)a(so)assusau)";
+const char *cache_signal_type = "((so)(so)(so)iiassusau)";
+const char *old_cache_signal_type = "((so)(so)(so)a(so)assusau)";
static DBusHandlerResult
handle_add_accessible (DBusConnection *bus, DBusMessage *message, void *user_data)
{
DBusMessageIter iter;
+ const char *signature = dbus_message_get_signature (message);
- if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0)
+ if (strcmp (signature, cache_signal_type) != 0 &&
+ strcmp (signature, old_cache_signal_type) != 0)
{
- g_warning ("AT-SPI: AddAccessible with unknown signature %s\n",
- dbus_message_get_signature (message));
+ g_warning ("AT-SPI: AddAccessible with unknown signature %s\n", signature);
return DBUS_HANDLER_RESULT_HANDLED;
}
static void
remove_hung_process (DBusPendingCall *pending, void *data)
{
-
hung_processes = g_slist_remove (hung_processes, data);
g_free (data);
dbus_pending_call_unref (pending);
g_warning ("Error retrieving accessibility bus address: %s: %s",
error.name, error.message);
dbus_error_free (&error);
- return NULL;
+ goto out;
}
{
DBUS_TYPE_INVALID))
{
dbus_message_unref (reply);
- return NULL;
+ goto out;
}
address = g_strdup (tmp_address);
dbus_message_unref (reply);
}
+out:
+ dbus_connection_unref (session_bus);
return address;
}
{
DBusError error;
char *address = NULL;
+ const char *address_env = NULL;
if (a11y_bus && dbus_connection_get_is_connected (a11y_bus))
return a11y_bus;
if (!dbus_connection_allocate_data_slot (&a11y_dbus_slot))
g_warning ("at-spi: Unable to allocate D-Bus slot");
+ address_env = g_getenv ("AT_SPI_BUS_ADDRESS");
+ if (address_env != NULL && *address_env != 0)
+ address = g_strdup (address_env);
#ifdef HAVE_X11
- address = get_accessibility_bus_address_x11 ();
+ if (!address)
+ address = get_accessibility_bus_address_x11 ();
#endif
if (!address)
address = get_accessibility_bus_address_dbus ();
if (!a11y_bus)
{
- g_warning ("Couldn't connect to accessibility bus: %s", error.message);
+ if (!g_getenv("SSH_CONNECTION"))
+ g_warning ("Couldn't connect to accessibility bus: %s", error.message);
dbus_error_free (&error);
return NULL;
}
/**
* atspi_set_timeout:
- * @val: The timeout value, in milliseconds, or -1 to disable the timeout.
- * @startup_time: The amount of time, in milliseconds, to allow to pass
- * before enforcing timeouts on an application. Can be used to prevent
- * timeout exceptions if an application is likely to block for an extended
- * period of time on initialization. -1 can be passed to disable this
- * behavior.
+ * @val: The timeout value, in milliseconds, or -1 to disable the timeout.
+ * @startup_time: The amount of time, in milliseconds, to allow to pass
+ * before enforcing timeouts on an application. Can be used to prevent
+ * timeout exceptions if an application is likely to block for an extended
+ * period of time on initialization. -1 can be passed to disable this
+ * behavior.
*
- * Set the timeout used for method calls. If this is not set explicitly,
- * a default of 0.8 ms is used.
- * Note that at-spi2-registryd currently uses a timeout of 3 seconds when
- * sending a keyboard event notification. This means that, if an AT makes
- * a call in response to the keyboard notification and the application
- * being called does not respond before the timeout is reached,
- * at-spi2-registryd will time out on the keyboard event notification and
- * pass the key onto the application (ie, reply to indicate that the key
- * was not consumed), so this may make it undesirable to set a timeout
- * larger than 3 seconds.
+ * Set the timeout used for method calls. If this is not set explicitly,
+ * a default of 0.8 ms is used.
+ * Note that at-spi2-registryd currently uses a timeout of 3 seconds when
+ * sending a keyboard event notification. This means that, if an AT makes
+ * a call in response to the keyboard notification and the application
+ * being called does not respond before the timeout is reached,
+ * at-spi2-registryd will time out on the keyboard event notification and
+ * pass the key onto the application (ie, reply to indicate that the key
+ * was not consumed), so this may make it undesirable to set a timeout
+ * larger than 3 seconds.
*
* By default, the normal timeout is set to 800 ms, and the application startup
* timeout is set to 15 seconds.
}
atspi_main_context = cnx;
atspi_dbus_connection_setup_with_g_main (atspi_get_a11y_bus (), cnx);
+
+ if (desktop)
+ {
+ gint i;
+ for (i = desktop->children->len - 1; i >= 0; i--)
+ {
+ AtspiAccessible *child = g_ptr_array_index (desktop->children, i);
+ if (child->parent.app && child->parent.app->bus)
+ atspi_dbus_connection_setup_with_g_main (child->parent.app->bus, cnx);
+ }
+ }
}
#ifdef DEBUG_REF_COUNTS
return NULL;
}
-void
+GHashTable *
_atspi_dbus_update_cache_from_dict (AtspiAccessible *accessible, DBusMessageIter *iter)
{
GHashTable *cache = _atspi_accessible_ref_cache (accessible);
g_hash_table_insert (cache, g_strdup (key), val);
dbus_message_iter_next (&iter_dict);
}
+
+ return cache;
}
gboolean