[at-spi2-core] Fix error parsing old DeviceEvent API introduced in last commit
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] Fix error parsing old DeviceEvent API introduced in last commit
- Date: Thu, 24 Feb 2011 20:27:48 +0000 (UTC)
commit d63149557f668ba2ec224a8ab61d367a22ef1195
Author: Mike Gorse <mgorse novell com>
Date: Thu Feb 24 14:31:00 2011 -0600
Fix error parsing old DeviceEvent API introduced in last commit
registryd/de-marshaller.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/registryd/de-marshaller.c b/registryd/de-marshaller.c
index 560020a..8b2b00f 100644
--- a/registryd/de-marshaller.c
+++ b/registryd/de-marshaller.c
@@ -87,11 +87,18 @@ dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibili
dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e)
{
DBusMessageIter iter;
+ dbus_uint16_t hw_code;
+ dbus_uint16_t modifiers;
dbus_message_iter_init(message, &iter);
- /* TODO: Remove the || for 2.1 */
- return spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT32, &e->hw_code, DBUS_TYPE_INT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID) ||
- spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &e->hw_code, DBUS_TYPE_INT16, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID);
+ if (spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT32, &e->hw_code, DBUS_TYPE_INT32, &e->modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID))
+ return TRUE;
+ /* TODO: Perhaps remove the below code for 2.1 */
+ if (!spi_dbus_message_iter_get_struct(&iter, DBUS_TYPE_UINT32, &e->type, DBUS_TYPE_INT32, &e->id, DBUS_TYPE_INT16, &hw_code, DBUS_TYPE_INT16, &modifiers, DBUS_TYPE_INT32, &e->timestamp, DBUS_TYPE_STRING, &e->event_string, DBUS_TYPE_BOOLEAN, &e->is_text, DBUS_TYPE_INVALID))
+ return FALSE;
+ e->hw_code = hw_code;
+ e->modifiers = modifiers;
+ return TRUE;
}
/*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]