#include <droute/droute.h>
#include <string.h>
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
#include "object.h"
#include "introspection.h"
static DBusMessage *
-impl_contains (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_Contains (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
dbus_int32_t x, y;
dbus_uint32_t coord_type;
- DBusError error;
dbus_bool_t retval;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
dbus_int32_t x, y;
dbus_uint32_t coord_type;
DBusMessage *reply;
- DBusError error;
AtkObject *child;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
+ (message, NULL, DBUS_TYPE_INT32, &x, DBUS_TYPE_INT32, &y,
DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
atk_component_ref_accessible_at_point (component, x, y,
(AtkCoordType) coord_type);
reply = spi_object_return_reference (message, child);
- g_object_unref (child);
+ if (child)
+ g_object_unref (child);
return reply;
}
impl_GetExtents (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
- DBusError error;
dbus_uint32_t coord_type;
gint ix, iy, iwidth, iheight;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
void *user_data)
{
AtkComponent *component = (AtkComponent *) user_data;
- DBusError error;
dbus_uint32_t coord_type;
gint ix = 0, iy = 0;
dbus_int32_t x, y;
g_return_val_if_fail (ATK_IS_COMPONENT (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_UINT32, &coord_type, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
switch (atklayer)
{
case ATK_LAYER_BACKGROUND:
- rv = Accessibility_LAYER_BACKGROUND;
+ rv = ATSPI_LAYER_BACKGROUND;
break;
case ATK_LAYER_CANVAS:
- rv = Accessibility_LAYER_CANVAS;
+ rv = ATSPI_LAYER_CANVAS;
break;
case ATK_LAYER_WIDGET:
- rv = Accessibility_LAYER_WIDGET;
+ rv = ATSPI_LAYER_WIDGET;
break;
case ATK_LAYER_MDI:
- rv = Accessibility_LAYER_MDI;
+ rv = ATSPI_LAYER_MDI;
break;
case ATK_LAYER_POPUP:
- rv = Accessibility_LAYER_POPUP;
+ rv = ATSPI_LAYER_POPUP;
break;
case ATK_LAYER_OVERLAY:
- rv = Accessibility_LAYER_OVERLAY;
+ rv = ATSPI_LAYER_OVERLAY;
break;
case ATK_LAYER_WINDOW:
- rv = Accessibility_LAYER_WINDOW;
+ rv = ATSPI_LAYER_WINDOW;
break;
default:
- rv = Accessibility_LAYER_INVALID;
+ rv = ATSPI_LAYER_INVALID;
break;
}
reply = dbus_message_new_method_return (message);
reply = dbus_message_new_method_return (message);
if (reply)
{
- dbus_message_append_args (reply, DBUS_TYPE_UINT32, &rv,
+ dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
DBUS_TYPE_INVALID);
}
return reply;
}
static DRouteMethod methods[] = {
- {impl_contains, "contains"},
+ {impl_Contains, "Contains"},
{impl_GetAccessibleAtPoint, "GetAccessibleAtPoint"},
{impl_GetExtents, "GetExtents"},
{impl_GetPosition, "GetPosition"},
spi_initialize_component (DRoutePath * path)
{
droute_path_add_interface (path,
- SPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
+ ATSPI_DBUS_INTERFACE_COMPONENT, spi_org_a11y_atspi_Component, methods, NULL);
};