const char *atspi_interface_registry = ATSPI_DBUS_INTERFACE_REGISTRY;
const char *atspi_interface_selection = ATSPI_DBUS_INTERFACE_SELECTION;
const char *atspi_interface_table = ATSPI_DBUS_INTERFACE_TABLE;
+const char *atspi_interface_table_cell = ATSPI_DBUS_INTERFACE_TABLE_CELL;
const char *atspi_interface_text = ATSPI_DBUS_INTERFACE_TEXT;
const char *atspi_interface_cache = ATSPI_DBUS_INTERFACE_CACHE;
const char *atspi_interface_value = ATSPI_DBUS_INTERFACE_VALUE;
"org.a11y.atspi.LoginHelper",
ATSPI_DBUS_INTERFACE_SELECTION,
ATSPI_DBUS_INTERFACE_TABLE,
+ ATSPI_DBUS_INTERFACE_TABLE_CELL,
ATSPI_DBUS_INTERFACE_TEXT,
ATSPI_DBUS_INTERFACE_VALUE,
NULL
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;
}
"/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;
}
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 && name && app->bus_name && !strcmp(app->bus_name, name))
+ g_object_run_dispose (G_OBJECT (app));
}
return DBUS_HANDLER_RESULT_HANDLED;
}
if (process_deferred_messages ())
return G_SOURCE_CONTINUE;
- g_source_unref (process_deferred_messages_source);
process_deferred_messages_source = NULL;
return G_SOURCE_REMOVE;
}
g_source_set_callback (process_deferred_messages_source,
process_deferred_messages_callback, NULL, NULL);
g_source_attach (process_deferred_messages_source, atspi_main_context);
+ g_source_unref (process_deferred_messages_source);
}
return DBUS_HANDLER_RESULT_HANDLED;
_atspi_dbus_set_interfaces (AtspiAccessible *accessible, DBusMessageIter *iter)
{
DBusMessageIter iter_array;
+ char *iter_sig = dbus_message_iter_get_signature (iter);
accessible->interfaces = 0;
- if (strcmp (dbus_message_iter_get_signature (iter), "as") != 0)
+ if (strcmp (iter_sig, "as") != 0)
{
g_warning ("_atspi_dbus_set_interfaces: Passed iterator with invalid signature %s", dbus_message_iter_get_signature (iter));
+ dbus_free (iter_sig);
return;
}
+ dbus_free (iter_sig);
dbus_message_iter_recurse (iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
/**
* 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.
app_startup_time = startup_time;
}
-/*
+/**
* atspi_set_main_context:
- * @cnx: The #GmainContext to use.
+ * @cnx: The #GMainContext to use.
*
* Sets the main loop context that AT-SPI should assume is in use when
* setting an idle callback.
if (process_deferred_messages_source != NULL)
{
g_source_destroy (process_deferred_messages_source);
- g_source_unref (process_deferred_messages_source);
process_deferred_messages_source = g_idle_source_new ();
g_source_set_callback (process_deferred_messages_source,
process_deferred_messages_callback, NULL, NULL);
g_source_attach (process_deferred_messages_source, cnx);
+ g_source_unref (process_deferred_messages_source);
}
atspi_main_context = cnx;
atspi_dbus_connection_setup_with_g_main (atspi_get_a11y_bus (), cnx);
retval = g_strdup (value->value_nick);
}
+ g_type_class_unref (type_class);
+
if (retval)
return _atspi_name_compat (retval);
return NULL;
}
-void
+GHashTable *
_atspi_dbus_update_cache_from_dict (AtspiAccessible *accessible, DBusMessageIter *iter)
{
GHashTable *cache = _atspi_accessible_ref_cache (accessible);
}
else if (!strcmp (key, "Attributes"))
{
+ char *iter_sig = dbus_message_iter_get_signature (&iter_variant);
val = g_new0 (GValue, 1);;
g_value_init (val, G_TYPE_HASH_TABLE);
- if (strcmp (dbus_message_iter_get_signature (&iter_variant),
- "a{ss}") != 0)
+ if (strcmp (iter_sig, "a{ss}") != 0)
+ {
+ dbus_free (iter_sig);
break;
+ }
+ dbus_free (iter_sig);
g_value_take_boxed (val, _atspi_dbus_hash_from_iter (&iter_variant));
}
else if (!strcmp (key, "Component.ScreenExtents"))
{
dbus_int32_t d_int;
AtspiRect extents;
+ char *iter_sig = dbus_message_iter_get_signature (&iter_variant);
val = g_new0 (GValue, 1);;
g_value_init (val, ATSPI_TYPE_RECT);
- if (strcmp (dbus_message_iter_get_signature (&iter_variant),
- "(iiii)") != 0)
+ if (strcmp (iter_sig, "(iiii)") != 0)
+ {
+ dbus_free (iter_sig);
break;
+ }
+ dbus_free (iter_sig);
dbus_message_iter_recurse (&iter_variant, &iter_struct);
dbus_message_iter_get_basic (&iter_struct, &d_int);
extents.x = d_int;
g_hash_table_insert (cache, g_strdup (key), val);
dbus_message_iter_next (&iter_dict);
}
+
+ return cache;
}
gboolean
projects / platform / upstream / at-spi2-core.git / blobdiff