*
* Copyright 2001, 2002 Sun Microsystems Inc.,
* Copyright 2001, 2002 Ximian, Inc.
+ * Copyright 2010, 2011 Novell, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
#include "atspi-private.h"
#include "X11/Xlib.h"
+#include "dbus/dbus-glib.h"
#include <stdio.h>
#include <string.h>
static void handle_get_items (DBusPendingCall *pending, void *user_data);
static DBusConnection *bus = NULL;
-static GHashTable *apps = NULL;
static GHashTable *live_refs = NULL;
-static GQueue *exception_handlers = NULL;
-static DBusError exception;
const char *atspi_path_dec = ATSPI_DBUS_PATH_DEC;
const char *atspi_path_registry = ATSPI_DBUS_PATH_REGISTRY;
}
}
}
+ dbus_message_unref (reply);
+ dbus_pending_call_unref (pending);
message = dbus_message_new_method_call (app->bus_name,
"/org/a11y/atspi/cache",
dbus_connection_send_with_reply (app->bus, message, &new_pending, 2000);
dbus_pending_call_set_notify (new_pending, handle_get_items, app, NULL);
+ dbus_message_unref (message);
}
static AtspiApplication *
if (!app) return NULL;
app->bus_name = bus_name_dup;
app->hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
- app->bus = _atspi_bus ();
+ app->bus = dbus_connection_ref (_atspi_bus ());
+ app->cache = ATSPI_CACHE_UNDEFINED;
g_hash_table_insert (app_hash, bus_name_dup, app);
dbus_error_init (&error);
message = dbus_message_new_method_call (bus_name, atspi_path_root,
dbus_connection_send_with_reply (app->bus, message, &pending, 2000);
dbus_pending_call_set_notify (pending, handle_get_bus_address, app, NULL);
+ dbus_message_unref (message);
return app;
}
DBusMessageIter iter, iter_struct;
const char *signature = dbus_message_get_signature (message);
AtspiAccessible *a;
- int id;
if (strcmp (signature, "(so)") != 0)
{
add_app_to_desktop (AtspiAccessible *a, const char *bus_name)
{
DBusError error;
- char *root_path;
dbus_error_init (&error);
AtspiAccessible *obj = ref_accessible (bus_name, atspi_path_root);
static void
add_accessible_from_iter (DBusMessageIter *iter)
{
- gint i;
GList *new_list;
DBusMessageIter iter_struct, iter_array;
const char *app_name, *path;
- AtspiApplication *app;
AtspiAccessible *accessible;
const char *name, *description;
dbus_uint32_t role;
_atspi_dbus_set_state (accessible, &iter_struct);
dbus_message_iter_next (&iter_struct);
- accessible->cached_properties |= ATSPI_CACHE_NAME | ATSPI_CACHE_ROLE | ATSPI_CACHE_PARENT;
+ _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))
- accessible->cached_properties |= ATSPI_CACHE_CHILDREN;
+ _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
* the one provided for us anymore */
static void
handle_get_items (DBusPendingCall *pending, void *user_data)
{
- AtspiApplication *app = user_data;
DBusMessage *reply = dbus_pending_call_steal_reply (pending);
DBusMessageIter iter, iter_array;
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;
}
dbus_message_iter_next (&iter_array);
}
dbus_message_unref (reply);
+ dbus_pending_call_unref (pending);
}
/* TODO: Do we stil need this function? */
ref_accessible_desktop (AtspiApplication *app)
{
DBusError error;
- GArray *apps = NULL;
- GArray *additions;
- gint i;
DBusMessage *message, *reply;
DBusMessageIter iter, iter_array;
gchar *bus_name_dup;
atspi_interface_accessible,
"GetChildren");
if (!message)
- return;
- reply = _atspi_dbus_send_with_reply_and_block (message);
+ return NULL;
+ reply = _atspi_dbus_send_with_reply_and_block (message, NULL);
if (!reply || strcmp (dbus_message_get_signature (reply), "a(so)") != 0)
{
- g_error ("Couldn't get application list: %s", error.message);
+ g_warning ("Couldn't get application list: %s", error.message);
if (reply)
dbus_message_unref (reply);
- return;
+ return NULL;
}
dbus_message_iter_init (reply, &iter);
dbus_message_iter_recurse (&iter, &iter_array);
{
DBusMessageIter iter;
const char *sender = dbus_message_get_sender (message);
- AtspiApplication *app = get_application (sender);
- const char *type = cache_signal_type;
if (strcmp (dbus_message_get_signature (message), cache_signal_type) != 0)
{
g_warning (_("AT-SPI: AddAccessible with unknown signature %s\n"),
dbus_message_get_signature (message));
- return;
+ return DBUS_HANDLER_RESULT_HANDLED;
}
dbus_message_iter_init (message, &iter);
{
int type = dbus_message_get_type (closure->message);
const char *interface = dbus_message_get_interface (closure->message);
- const char *member = dbus_message_get_member (closure->message);
- dbus_uint32_t v;
- char *bus_name;
if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
!strncmp (interface, "org.a11y.atspi.Event.", 21))
static int in_process_deferred_messages = 0;
if (in_process_deferred_messages)
- return;
+ return TRUE;
in_process_deferred_messages = 1;
while (deferred_messages != NULL)
{
{
int type = dbus_message_get_type (message);
const char *interface = dbus_message_get_interface (message);
- const char *member = dbus_message_get_member (message);
- dbus_uint32_t v;
- char *bus_name;
if (type == DBUS_MESSAGE_TYPE_SIGNAL &&
!strncmp (interface, "org.a11y.atspi.Event.", 21))
(long) BUFSIZ, False,
(Atom) 31, &actual_type, &actual_format,
&nitems, &leftover, &data);
+ XCloseDisplay (bridge_display);
dbus_error_init (&error);
{
DBusError error;
char *match;
- int i;
if (atspi_inited)
{
bus = get_accessibility_bus ();
if (!bus)
{
- g_error ("Couldn't get session bus");
+ g_warning ("Couldn't get session bus");
return 2;
}
dbus_bus_register (bus, &error);
va_list args)
{
AtspiObject *aobj = ATSPI_OBJECT (obj);
- dbus_bool_t retval;
DBusError err;
DBusMessage *msg = NULL, *reply = NULL;
DBusMessageIter iter;
reply = dbind_send_and_allow_reentry (aobj->app->bus, msg, &err);
out:
va_end (args);
+ if (msg)
+ dbus_message_unref (msg);
_atspi_process_deferred_messages ((gpointer)TRUE);
if (dbus_error_is_set (&err))
{
if (!message)
{
// TODO: throw exception
- goto done;
+ return FALSE;
}
dbus_message_append_args (message, DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
dbus_error_init (&err);
// TODO: throw exception
goto done;
}
+
+ if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
+ {
+ const char *err;
+ dbus_message_get_args (message, NULL, DBUS_TYPE_STRING, &err, DBUS_TYPE_INVALID);
+ if (err)
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err);
+ goto done;
+ }
+
dbus_message_iter_init (reply, &iter);
if (dbus_message_iter_get_arg_type (&iter) != 'v')
{
else
{
dbus_message_iter_get_basic (&iter_variant, data);
- dbus_message_unref (reply);
if (type [0] == 's')
*(char **)data = g_strdup (*(char **)data);
}
retval = TRUE;
done:
+ if (reply)
+ dbus_message_unref (reply);
return retval;
}
DBusMessage *
-_atspi_dbus_send_with_reply_and_block (DBusMessage *message)
+_atspi_dbus_send_with_reply_and_block (DBusMessage *message, GError **error)
{
DBusMessage *reply;
DBusError err;
_atspi_process_deferred_messages ((gpointer)TRUE);
dbus_message_unref (message);
if (err.message)
- g_warning (_("AT-SPI: Got error: %s\n"), err.message);
+ {
+ if (error)
+ g_set_error_literal (error, ATSPI_ERROR, ATSPI_ERROR_IPC, err.message);
+ dbus_error_free (&err);
+ }
return reply;
}
DBusMessageIter iter;
GHashTable *ret;
- _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL);
+ if (!message)
+ return NULL;
+
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
ret = _atspi_dbus_hash_from_iter (&iter);
DBusMessageIter iter;
GArray *ret;
- _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL);
+ if (!message)
+ return NULL;
+
+ _ATSPI_DBUS_CHECK_SIG (message, "a{ss}", NULL, NULL);
dbus_message_iter_init (message, &iter);
{
DBusMessageIter iter_array, iter_dict;
GArray *array = g_array_new (TRUE, TRUE, sizeof (gchar *));
- gint count = 0;
dbus_message_iter_recurse (iter, &iter_array);
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
accessible->interfaces |= (1 << n);
dbus_message_iter_next (&iter_array);
}
- accessible->cached_properties |= ATSPI_CACHE_INTERFACES;
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_INTERFACES);
}
void
else
accessible->states->states = val;
}
- accessible->cached_properties |= ATSPI_CACHE_STATES;
+ _atspi_accessible_add_cache (accessible, ATSPI_CACHE_STATES);
}
GQuark
projects / platform / upstream / at-spi2-core.git / blobdiff