#include <droute/droute.h>
#include "common/spi-dbus.h"
-
-#include "accessible-marshaller.h"
+#include "object.h"
+#include "introspection.h"
static dbus_bool_t
impl_get_CharacterCount (DBusMessageIter * iter, void *user_data)
if (reply)
{
dbus_message_iter_init_append (reply, &iter);
- spi_atk_append_attribute_set (&iter, set);
+ spi_object_append_attribute_set (&iter, set);
dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
DBUS_TYPE_INT32, &endOffset,
DBUS_TYPE_INVALID);
if (reply)
{
dbus_message_iter_init_append (reply, &iter);
- spi_atk_append_attribute_set (&iter, set);
+ spi_object_append_attribute_set (&iter, set);
}
atk_attribute_set_free (set);
return reply;
dbus_int32_t startOffset, endOffset;
gint intstart_offset = 0, intend_offset = 0;
DBusMessage *reply;
- AtkAttributeSet *attributes, *default_attributes = NULL;
+ AtkAttributeSet *attributes = NULL;
AtkAttribute *attr = NULL;
DBusMessageIter iter, iterArray;
atk_text_get_run_attributes (text, offset, &intstart_offset,
&intend_offset);
+ if (includeDefaults)
+ {
+ attributes = g_slist_concat (attributes,
+ atk_text_get_default_attributes (text));
+ }
+
reply = dbus_message_new_method_return (message);
if (!reply)
return NULL;
dbus_message_iter_init_append (reply, &iter);
- dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "{ss}",
- &iterArray);
- spi_atk_append_attribute_set_inner (&iterArray, attributes);
- if (includeDefaults)
- {
- default_attributes = atk_text_get_default_attributes (text);
- spi_atk_append_attribute_set_inner (&iterArray, default_attributes);
- }
- dbus_message_iter_close_container (&iter, &iterArray);
+ spi_object_append_attribute_set (&iter, attributes);
startOffset = intstart_offset;
endOffset = intend_offset;
dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &endOffset);
atk_attribute_set_free (attributes);
- if (default_attributes)
- atk_attribute_set_free (default_attributes);
return reply;
}
if (reply)
{
dbus_message_iter_init_append (reply, &iter);
- spi_atk_append_attribute_set (&iter, attributes);
+ spi_object_append_attribute_set (&iter, attributes);
}
if (attributes)
spi_initialize_text (DRoutePath * path)
{
droute_path_add_interface (path,
- SPI_DBUS_INTERFACE_TEXT, methods, properties);
+ SPI_DBUS_INTERFACE_TEXT, spi_org_a11y_atspi_Text, methods, properties);
};