Post-release version bump

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / spi-dbus.c

diff --git a/atk-adaptor/spi-dbus.c b/atk-adaptor/spi-dbus.c
index b7dc881..e757376 100644 (file)
--- a/atk-adaptor/spi-dbus.c
+++ b/atk-adaptor/spi-dbus.c
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <dbus/dbus.h>
 
-#include "spi-types.h"
+#include <atspi/atspi.h>
 
 DBusMessage *
 spi_dbus_general_error (DBusMessage * message)
@@ -125,12 +125,12 @@ dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...)
     ptr = va_arg(args, void *);
     dbus_message_iter_append_basic(&iter_struct, type, ptr);
   }
-  if (!dbus_message_iter_close_container(iter, &iter_struct)) return FALSE;
   va_end(args);
+  if (!dbus_message_iter_close_container(iter, &iter_struct)) return FALSE;
   return TRUE;
 }
 
-dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const AtspiDeviceEvent *e)
 {
   DBusMessageIter iter;
 
@@ -139,7 +139,7 @@ dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibili
   return spi_dbus_message_iter_append_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);
 }
 
-dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e)
+dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e)
 {
   DBusMessageIter iter;
 
@@ -181,7 +181,7 @@ spi_dbus_signal_new (const char *path,
                      dbus_int32_t detail2)
 {
   DBusMessage *sig;
-  DBusMessageIter iter, sub;
+  DBusMessageIter iter;
   gchar *cname, *t;
 
   if (!klass) klass = "";