static AtkImage *
get_image (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_IMAGE (obj);
static AtkImage *
get_image_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_IMAGE(obj))
return NULL;
return ATK_IMAGE (obj);
{
AtkImage *image = get_image (message);
DBusError error;
- dbus_uint32_t coordType;
+ dbus_int16_t coordType;
gint ix, iy, iwidth, iheight;
if (!image)
return spi_dbus_general_error (message);
dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coordType, DBUS_TYPE_INVALID))
+ (message, &error, DBUS_TYPE_INT16, &coordType, DBUS_TYPE_INVALID))
{
return SPI_DBUS_RETURN_ERROR (message, &error);
}
{
AtkImage *image = get_image (message);
DBusError error;
- dbus_uint32_t coord_type;
+ dbus_int16_t coord_type;
gint ix = 0, iy = 0;
dbus_int32_t x, y;
DBusMessage *reply;
return spi_dbus_general_error (message);
dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, &error, DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID))
{
return SPI_DBUS_RETURN_ERROR (message, &error);
}
void
spi_initialize_image (DRouteData * data)
{
- droute_add_interface (data, "org.freedesktop.atspi.Image", methods,
+ droute_add_interface (data, SPI_DBUS_INTERFACE_IMAGE, methods,
properties,
(DRouteGetDatumFunction) get_image_from_path, NULL);
};