#include <atk/atk.h>
#include <droute/droute.h>
-#include "accessible-marshaller.h"
#include "common/spi-dbus.h"
+#include "object.h"
+#include "introspection.h"
static dbus_bool_t
impl_get_NRows (DBusMessageIter * iter, void *user_data)
{
AtkTable *table = (AtkTable *) user_data;
g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
- return spi_dbus_return_v_object (iter, atk_table_get_caption (table),
- FALSE);
+ spi_object_append_v_reference (iter, atk_table_get_caption (table));
+ return TRUE;
}
static dbus_bool_t
{
AtkTable *table = (AtkTable *) user_data;
g_return_val_if_fail (ATK_IS_TABLE (user_data), FALSE);
- return spi_dbus_return_v_object (iter, atk_table_get_summary (table),
- FALSE);
+ spi_object_append_v_reference (iter, atk_table_get_summary (table));
+ return TRUE;
}
static dbus_bool_t
{
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row, column;
+ DBusMessage *reply;
DBusError error;
AtkObject *obj;
return droute_invalid_arguments_error (message);
}
obj = atk_table_ref_at (table, row, column);
- return spi_dbus_return_object (message, obj, TRUE, TRUE);
+ reply = spi_object_return_reference (message, obj);
+ g_object_unref (obj);
+
+ return reply;
}
static DBusMessage *
AtkTable *table = (AtkTable *) user_data;
dbus_int32_t row;
DBusError error;
- AtkObject *obj;
+ AtkObject *obj = NULL;
g_return_val_if_fail (ATK_IS_TABLE (user_data),
droute_not_yet_handled_error (message));
return droute_invalid_arguments_error (message);
}
obj = atk_table_get_row_header (table, row);
- obj = atk_table_get_row_header (table, row);
- return spi_dbus_return_object (message, obj, TRUE, FALSE);
+ return spi_object_return_reference (message, obj);
}
static DBusMessage *
return droute_invalid_arguments_error (message);
}
obj = atk_table_get_column_header (table, column);
- obj = atk_table_get_column_header (table, column);
- return spi_dbus_return_object (message, obj, TRUE, FALSE);
+ return spi_object_return_reference (message, obj);
}
static DBusMessage *
{impl_get_NColumns, NULL, "NColumns"},
{impl_get_Caption, NULL, "Caption"},
{impl_get_Summary, NULL, "Summary"},
- {impl_get_NSelectedRows, NULL, "nSelectedRows"},
- {impl_get_NSelectedColumns, NULL, "nSelectedColumns"},
+ {impl_get_NSelectedRows, NULL, "NSelectedRows"},
+ {impl_get_NSelectedColumns, NULL, "NSelectedColumns"},
{NULL, NULL, NULL}
};
spi_initialize_table (DRoutePath * path)
{
droute_path_add_interface (path,
- SPI_DBUS_INTERFACE_TABLE, methods, properties);
+ SPI_DBUS_INTERFACE_TABLE, spi_org_a11y_atspi_Table, methods, properties);
};