#include <atk/atk.h>
#include <droute/droute.h>
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
#include "object.h"
#include "introspection.h"
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
+ DBusMessage *reply;
dbus_int32_t selectedChildIndex;
AtkObject *atk_object;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
- return spi_object_return_reference (message, atk_object);
+ reply = spi_object_return_reference (message, atk_object);
+ if (atk_object)
+ g_object_unref (atk_object);
+
+ return reply;
}
static DBusMessage *
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t childIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t selectedChildIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t childIndex;
dbus_bool_t rv;
DBusMessage *reply;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
+ (message, NULL, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
}
void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
- DBusError error;
dbus_int32_t selectedChildIndex;
dbus_bool_t rv = FALSE;
gint i, nselected;
g_return_val_if_fail (ATK_IS_SELECTION (user_data),
droute_not_yet_handled_error (message));
- dbus_error_init (&error);
if (!dbus_message_get_args
- (message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
+ (message, NULL, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
return droute_invalid_arguments_error (message);
spi_initialize_selection (DRoutePath * path)
{
droute_path_add_interface (path,
- SPI_DBUS_INTERFACE_SELECTION,
- spi_org_freedesktop_atspi_Selection,
+ ATSPI_DBUS_INTERFACE_SELECTION,
+ spi_org_a11y_atspi_Selection,
methods, properties);
};