* Boston, MA 02111-1307, USA.
*/
-#include "spi-common/spi-dbus.h"
+#include <droute/droute.h>
+
+#include "common/spi-dbus.h"
+#include "common/spi-stateset.h"
#include "accessible-register.h"
#include "accessible-marshaller.h"
+#include "adaptors.h"
+
/*---------------------------------------------------------------------------*/
/*
path = atk_dbus_object_to_path (obj);
- if (unref)
+ if (obj && unref)
g_object_unref (obj);
+ if (!path)
+ path = g_strdup (SPI_DBUS_PATH_NULL);
+
reply = dbus_message_new_method_return (message);
if (reply)
{
- dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, path,
+ dbus_message_append_args (reply, DBUS_TYPE_OBJECT_PATH, &path,
DBUS_TYPE_INVALID);
}
+
+ g_free (path);
+
return reply;
}
/*---------------------------------------------------------------------------*/
-static void
+void
append_atk_object_interfaces (AtkObject *object, DBusMessageIter *iter)
{
const gchar *itf;
{
DBusMessageIter *iter_array;
DBusMessageIter iter_struct, iter_sub_array;
- dbus_int32_t states [2];
+ dbus_uint32_t states [2];
int count;
const char *name, *desc;
- int i;
dbus_uint32_t role;
- GSList *l;
iter_array = (DBusMessageIter *) iter;
g_free(path);
/* Marshall state set */
- spi_atk_state_to_dbus_array (obj, &states);
+ spi_atk_state_to_dbus_array (obj, states);
dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", &iter_sub_array);
for (count = 0; count < 2; count++)
{
dbus_message_iter_close_container (iter_array, &iter_struct);
}
+void
+spi_atk_append_attribute_set (DBusMessageIter *iter, AtkAttributeSet *attr)
+{
+ DBusMessageIter dictIter;
+
+ dbus_message_iter_open_container (iter, DBUS_TYPE_ARRAY, "{ss}", &dictIter);
+ spi_atk_append_attribute_set_inner (&dictIter, attr);
+ dbus_message_iter_close_container (iter, &dictIter);
+}
+
+void
+spi_atk_append_attribute_set_inner (DBusMessageIter *iter, AtkAttributeSet *attr)
+{
+ DBusMessageIter dictEntryIter;
+
+ while (attr)
+ {
+ AtkAttribute *attribute = (AtkAttribute *) attr->data;
+ dbus_message_iter_open_container (iter, DBUS_TYPE_DICT_ENTRY, NULL, &dictEntryIter);
+ dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->name);
+ dbus_message_iter_append_basic (&dictEntryIter, DBUS_TYPE_STRING, &attribute->value);
+ dbus_message_iter_close_container (iter, &dictEntryIter);
+ attr = g_slist_next (attr);
+ }
+}
+
/*END------------------------------------------------------------------------*/