From 952cf442cac989adb10380695e0d1c7dccdcfa17 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 30 Jun 2008 17:11:11 -0400 Subject: [PATCH] Fix arg types for coord_type (uint32 -> int16) --- atk-adaptor/component.c | 16 ++++++++-------- atk-adaptor/image.c | 8 ++++---- atk-adaptor/text.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/atk-adaptor/component.c b/atk-adaptor/component.c index 7cf0e23..a095216 100644 --- a/atk-adaptor/component.c +++ b/atk-adaptor/component.c @@ -47,7 +47,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkComponent *component = get_component (message); dbus_int32_t x, y; - dbus_uint32_t coord_type; + dbus_int16_t coord_type; DBusError error; dbus_bool_t retval; DBusMessage *reply; @@ -57,7 +57,7 @@ impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data) dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_UINT32, &y, - DBUS_TYPE_INT32, &coord_type, DBUS_TYPE_INVALID)) + DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { return SPI_DBUS_RETURN_ERROR (message, &error); } @@ -78,7 +78,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, { AtkComponent *component = get_component (message); dbus_int32_t x, y; - dbus_uint32_t coord_type; + dbus_int16_t coord_type; DBusError error; AtkObject *child; @@ -87,7 +87,7 @@ impl_getAccessibleAtPoint (DBusConnection * bus, DBusMessage * message, dbus_error_init (&error); if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y, - DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID)) + DBUS_TYPE_INT16, &coord_type, DBUS_TYPE_INVALID)) { return SPI_DBUS_RETURN_ERROR (message, &error); } @@ -102,14 +102,14 @@ impl_getExtents (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkComponent *component = get_component (message); DBusError error; - dbus_uint32_t coord_type; + dbus_int16_t coord_type; gint ix, iy, iwidth, iheight; if (!component) 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); } @@ -124,7 +124,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, { AtkComponent *component = get_component (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; @@ -133,7 +133,7 @@ impl_getPosition (DBusConnection * bus, DBusMessage * message, 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); } diff --git a/atk-adaptor/image.c b/atk-adaptor/image.c index 88a7e43..90d4f4a 100644 --- a/atk-adaptor/image.c +++ b/atk-adaptor/image.c @@ -69,14 +69,14 @@ impl_getImageExtents (DBusConnection * bus, DBusMessage * message, { 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); } @@ -91,7 +91,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, { 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; @@ -100,7 +100,7 @@ impl_getImagePosition (DBusConnection * bus, DBusMessage * message, 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); } diff --git a/atk-adaptor/text.c b/atk-adaptor/text.c index 72ee95a..ca51ce1 100644 --- a/atk-adaptor/text.c +++ b/atk-adaptor/text.c @@ -423,7 +423,7 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, { 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; @@ -433,7 +433,7 @@ impl_getCharacterExtents (DBusConnection * bus, DBusMessage * message, 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); @@ -460,7 +460,7 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, { 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; @@ -470,7 +470,7 @@ impl_getOffsetAtPoint (DBusConnection * bus, DBusMessage * message, 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); } @@ -630,7 +630,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, { 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; @@ -641,7 +641,7 @@ impl_getRangeExtents (DBusConnection * bus, DBusMessage * message, 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); } @@ -670,7 +670,7 @@ impl_getBoundedRanges (DBusConnection * bus, DBusMessage * message, { 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; -- 2.7.4