#include <atk/atk.h>
#include <droute/droute.h>
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
+#include "accessible-marshaller.h"
static dbus_bool_t
-impl_get_nSelectedChildren (DBusMessageIter * iter,
- void *user_data)
+impl_get_NSelectedChildren (DBusMessageIter * iter, void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
return droute_return_v_int32 (iter,
- atk_selection_get_selection_count
- (selection));
+ atk_selection_get_selection_count
+ (selection));
}
/*static char *
-impl_get_nSelectedChildren_str (void *datum)
+impl_get_NSelectedChildren_str (void *datum)
{
- g_assert (ATK_IS_HYPERLINK (datum));
+ g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
return g_strdup_printf ("%d",
- atk_selection_get_selection_count ((AtkSelection *)
- datum));
+ atk_selection_get_selection_count ((AtkSelection *)
+ datum));
}*/
static DBusMessage *
-impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusError error;
(message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
- return spi_dbus_return_object (message, atk_object, TRUE);
+ return spi_dbus_return_object (message, atk_object, TRUE, TRUE);
}
static DBusMessage *
-impl_selectChild (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_SelectChild (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusError error;
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
rv = atk_selection_add_selection (selection, childIndex);
reply = dbus_message_new_method_return (message);
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusError error;
(message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
rv = atk_selection_remove_selection (selection, selectedChildIndex);
reply = dbus_message_new_method_return (message);
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_isChildSelected (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_IsChildSelected (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusError error;
if (!dbus_message_get_args
(message, &error, DBUS_TYPE_INT32, &childIndex, DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
rv = atk_selection_is_child_selected (selection, childIndex);
reply = dbus_message_new_method_return (message);
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_SelectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
dbus_bool_t rv;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_clearSelection (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_ClearSelection (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
dbus_bool_t rv;
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DBusMessage *
-impl_deselectChild (DBusConnection * bus, DBusMessage * message,
- void *user_data)
+impl_DeselectChild (DBusConnection * bus, DBusMessage * message,
+ void *user_data)
{
AtkSelection *selection = (AtkSelection *) user_data;
DBusError error;
(message, &error, DBUS_TYPE_INT32, &selectedChildIndex,
DBUS_TYPE_INVALID))
{
- return SPI_DBUS_RETURN_ERROR (message, &error);
+ return droute_invalid_arguments_error (message);
}
nselected = atk_selection_get_selection_count (selection);
for (i = 0; i < nselected; ++i)
{
AtkObject *selected_obj = atk_selection_ref_selection (selection, i);
if (atk_object_get_index_in_parent (selected_obj) == selectedChildIndex)
- {
- g_object_unref (G_OBJECT (selected_obj));
- rv = atk_selection_remove_selection (selection, i);
- break;
- }
+ {
+ g_object_unref (G_OBJECT (selected_obj));
+ rv = atk_selection_remove_selection (selection, i);
+ break;
+ }
g_object_unref (G_OBJECT (selected_obj));
}
reply = dbus_message_new_method_return (message);
if (reply)
{
dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
- DBUS_TYPE_INVALID);
+ DBUS_TYPE_INVALID);
}
return reply;
}
static DRouteMethod methods[] = {
- {impl_getSelectedChild, "getSelectedChild"},
- {impl_selectChild, "selectChild"},
- {impl_deselectSelectedChild, "deselectSelectedChild"},
- {impl_isChildSelected, "isChildSelected"},
- {impl_selectAll, "selectAll"},
- {impl_clearSelection, "clearSelection"},
- {impl_deselectChild, "deselectChild"},
+ {impl_GetSelectedChild, "GetSelectedChild"},
+ {impl_SelectChild, "SelectChild"},
+ {impl_DeselectSelectedChild, "DeselectSelectedChild"},
+ {impl_IsChildSelected, "IsChildSelected"},
+ {impl_SelectAll, "SelectAll"},
+ {impl_ClearSelection, "ClearSelection"},
+ {impl_DeselectChild, "DeselectChild"},
{NULL, NULL}
};
static DRouteProperty properties[] = {
- {impl_get_nSelectedChildren, NULL, "nSelectedChildren"},
+ {impl_get_NSelectedChildren, NULL, "NSelectedChildren"},
{NULL, NULL, NULL}
};
void
-spi_initialize_selection (DRoutePath *path)
+spi_initialize_selection (DRoutePath * path)
{
droute_path_add_interface (path,
SPI_DBUS_INTERFACE_SELECTION,
- methods,
- properties);
+ methods, properties);
};