static AtkText *
get_text (DBusMessage * message)
{
- AtkObject *obj = spi_dbus_get_object (dbus_message_get_path (message));
+ AtkObject *obj = atk_dbus_get_object (dbus_message_get_path (message));
if (!obj)
return NULL;
return ATK_TEXT (obj);
static AtkText *
get_text_from_path (const char *path, void *user_data)
{
- AtkObject *obj = spi_dbus_get_object (path);
+ AtkObject *obj = atk_dbus_get_object (path);
if (!obj || !ATK_IS_TEXT(obj))
return NULL;
return ATK_TEXT (obj);
set = atk_text_get_run_attributes (text, offset,
&intstart_offset, &intend_offset);
+
+ rv = _string_from_attribute_set (set);
+
startOffset = intstart_offset;
endOffset = intend_offset;
- rv = _string_from_attribute_set (set);
reply = dbus_message_new_method_return (message);
if (reply)
{
- dbus_message_append_args (reply, DBUS_TYPE_INT32, &startOffset,
- DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_STRING,
- &rv, DBUS_TYPE_INVALID);
+ dbus_message_append_args (reply, DBUS_TYPE_STRING, &rv, DBUS_TYPE_INT32, &startOffset,
+ DBUS_TYPE_INT32, &endOffset, DBUS_TYPE_INVALID);
}
- g_free (rv);
atk_attribute_set_free (set);
+ g_free(rv);
return reply;
}
{
AtkText *text = get_text (message);
dbus_int32_t offset;
- dbus_uint32_t coordType;
+ dbus_int16_t coordType;
dbus_int32_t x, y, width, height;
gint ix = 0, iy = 0, iw = 0, ih = 0;
DBusError error;
return spi_dbus_general_error (message);
dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT32, &coordType,
+ (message, &error, DBUS_TYPE_INT32, &offset, DBUS_TYPE_INT16, &coordType,
DBUS_TYPE_INVALID))
{
return SPI_DBUS_RETURN_ERROR (message, &error);
{
AtkText *text = get_text (message);
dbus_int32_t x, y;
- dbus_uint32_t coordType;
+ dbus_int16_t coordType;
dbus_int32_t rv;
DBusError error;
DBusMessage *reply;
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
- DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
+ DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID))
{
return SPI_DBUS_RETURN_ERROR (message, &error);
}
{
AtkText *text = get_text (message);
dbus_int32_t startOffset, endOffset;
- dbus_uint32_t coordType;
+ dbus_int16_t coordType;
AtkTextRectangle rect;
dbus_int32_t x, y, width, height;
DBusError error;
dbus_error_init (&error);
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &startOffset, DBUS_TYPE_INT32,
- &endOffset, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
+ &endOffset, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID))
{
return SPI_DBUS_RETURN_ERROR (message, &error);
}
{
AtkText *text = get_text (message);
dbus_int32_t x, y, width, height;
- dbus_uint32_t coordType, xClipType, yClipType;
+ dbus_int16_t coordType, xClipType, yClipType;
DBusError error;
AtkTextRange **range_list = NULL;
AtkTextRectangle rect;