{
GList *list;
-#ifndef DISABLE_P2P
- atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
-#endif
+ if (spi_global_app_data->server)
+ atspi_dbus_server_setup_with_g_main (spi_global_app_data->server, cnx);
atspi_dbus_connection_setup_with_g_main (spi_global_app_data->bus, cnx);
+ atspi_set_main_context (cnx);
for (list = spi_global_app_data->direct_connections; list; list = list->next)
atspi_dbus_connection_setup_with_g_main (list->data, cnx);
}
{
SpiReentrantCallClosure *closure = data;
- if (!dbus_connection_get_is_connected (closure->bus))
- g_main_loop_quit (closure->loop);
+ switch_main_context (NULL);
+ g_main_loop_quit (closure->loop);
closure->timeout = -1;
return FALSE;
}
{
DBusPendingCall *pending;
SpiReentrantCallClosure closure;
- GMainContext *main_context;
GSource *source;
- main_context = (g_getenv ("AT_SPI_CLIENT") ? NULL :
- spi_global_app_data->main_context);
closure.bus = bus;
- closure.loop = g_main_loop_new (main_context, FALSE);
+ closure.loop = g_main_loop_new (spi_global_app_data->main_context, FALSE);
closure.reply = NULL;
- switch_main_context (main_context);
+ switch_main_context (spi_global_app_data->main_context);
if (!dbus_connection_send_with_reply (bus, message, &pending, 9000) || !pending)
{
dbus_pending_call_set_notify (pending, set_reply, (void *) &closure, NULL);
source = g_timeout_source_new (500);
g_source_set_callback (source, timeout_reply, &closure, NULL);
- closure.timeout = g_source_attach (source, main_context);
+ closure.timeout = g_source_attach (source, spi_global_app_data->main_context);
g_source_unref (source);
g_main_loop_run (closure.loop);
if (closure.timeout != -1)
g_source_destroy (source);
g_main_loop_unref (closure.loop);
+ if (!closure.reply)
+ dbus_pending_call_cancel (pending);
return closure.reply;
}
* key_event)
{
DBusMessage *message;
- DBusError error;
dbus_bool_t consumed = FALSE;
message =
ATSPI_DBUS_INTERFACE_DEC,
"NotifyListenersSync");
- dbus_error_init (&error);
if (spi_dbus_marshal_deviceEvent (message, key_event))
{
DBusMessage *reply =
{
DBusError error;
dbus_error_init (&error);
- dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN, &consumed,
- DBUS_TYPE_INVALID);
+ if (!dbus_message_get_args (reply, &error, DBUS_TYPE_BOOLEAN,
+ &consumed, DBUS_TYPE_INVALID))
+ {
+ /* TODO: print a warning */
+ dbus_error_free (&error);
+ }
dbus_message_unref (reply);
}
}
* TODO: FOr 2.2, have at-spi2-core define a special "cache listener" for
* this instead, so that we don't send these if no one is listening */
if (!g_strcmp0 (data [1], "ChildrenChanged") ||
- !g_strcmp0 (data [1], "PropertyChange") ||
+ ((!g_strcmp0 (data [1], "PropertyChange")) &&
+ (!g_strcmp0 (data [2], "accessible-name") ||
+ !g_strcmp0 (data [2], "accessible-description") ||
+ !g_strcmp0 (data [2], "accessible-parent") ||
+ !g_strcmp0 (data [2], "accessible-role"))) ||
!g_strcmp0 (data [1], "StateChanged"))
{
g_free (data [2]);
void (*append_variant) (DBusMessageIter *, const char *, const void *))
{
DBusConnection *bus = spi_global_app_data->bus;
- const char *path;
+ char *path;
char *minor_dbus;
gchar *cname;
const GValue * param_values, gpointer data)
{
AtkObject *accessible;
- gchar *pname;
+ const gchar *pname;
guint detail1;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
* Gtk:AtkDocument:load-complete -> document:load-complete
* Gtk:AtkDocument:load-stopped -> document:load-stopped
* Gtk:AtkDocument:reload -> document:reload
+ * Gtk:AtkDocument:page-changed -> document:page-changed
*/
static gboolean
document_event_listener (GSignalInvocationHint * signal_hint,
AtkObject *accessible;
GSignalQuery signal_query;
const gchar *name, *s;
+ gint detail1 = 0;
g_signal_query (signal_hint->signal_id, &signal_query);
name = signal_query.signal_name;
+ if (n_param_values > 0) // on the case of page-changed
+ if (G_VALUE_TYPE (¶m_values[1]) == G_TYPE_INT)
+ detail1 = g_value_get_int (¶m_values[1]);
+
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
s = atk_object_get_name (accessible);
- emit_event (accessible, ITF_EVENT_DOCUMENT, name, "", 0, 0,
+ emit_event (accessible, ITF_EVENT_DOCUMENT, name, "", detail1, 0,
DBUS_TYPE_STRING_AS_STRING, s, append_basic);
return TRUE;
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
- gchar *minor, *text;
+ const gchar *minor_raw, *text;
+ gchar *minor;
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
/* Add the insert and keep any detail coming from atk */
- minor = g_quark_to_string (signal_hint->detail);
- if (minor)
- minor = g_strconcat ("insert:", minor, NULL);
+ minor_raw = g_quark_to_string (signal_hint->detail);
+ if (minor_raw)
+ minor = g_strconcat ("insert:", minor_raw, NULL);
else
minor = g_strdup ("insert");
guint text_changed_signal_id;
GSignalQuery signal_query;
const gchar *name;
- gchar *minor, *text;
+ const gchar *minor_raw, *text;
+ gchar *minor;
gint detail1 = 0, detail2 = 0;
accessible = ATK_OBJECT (g_value_get_object (¶m_values[0]));
g_signal_query (text_changed_signal_id, &signal_query);
name = signal_query.signal_name;
- minor = g_quark_to_string (signal_hint->detail);
+ minor_raw = g_quark_to_string (signal_hint->detail);
/* Add the delete and keep any detail coming from atk */
- minor = g_quark_to_string (signal_hint->detail);
- if (minor)
- minor = g_strconcat ("delete:", minor, NULL);
+ if (minor_raw)
+ minor = g_strconcat ("delete:", minor_raw, NULL);
else
minor = g_strdup ("delete");
detail1);
emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
"(so)", ao, append_object);
+ g_object_unref (ao);
}
else
{
add_signal_listener (document_event_listener, "Gtk:AtkDocument:reload");
add_signal_listener (document_event_listener,
"Gtk:AtkDocument:load-stopped");
+ add_signal_listener (document_event_listener,
+ "Gtk:AtkDocument:page-changed");
/* TODO Fake this event on the client side */
add_signal_listener (state_event_listener, "Gtk:AtkObject:state-change");
/* TODO */