#include <gdk/gdkwindow.h>
#include <atk-adaptor/spi-private.h>
-#include <atk-adaptor/keymasks.h>
+#include <spi-common/keymasks.h>
#include <droute/droute.h>
#include <spi-common/spi-dbus.h>
#include <spi-common/spi-types.h>
dbus_bool_t consumed = FALSE;
dbus_error_init(&error);
- if (spi_dbus_marshall_deviceEvent(message, key_event))
+ if (spi_dbus_marshal_deviceEvent(message, key_event))
{
// TODO: Evaluate performance: perhaps rework this whole architecture
// to avoid blocking calls
dbus_bool_t ret;
DBusMessage *reply;
- if (!spi_dbus_demarshall_deviceEvent(message, &event))
+ if (!spi_dbus_demarshal_deviceEvent(message, &event))
{
return spi_dbus_general_error (message);
}
Accessibility_DeviceEvent event;
DBusMessage *reply;
- if (!spi_dbus_demarshall_deviceEvent(message, &event))
+ if (!spi_dbus_demarshal_deviceEvent(message, &event))
{
return spi_dbus_general_error (message);
}