2009-27-09 Mark Doffman <mark.doffman@codethink.co.uk>

        Add missing headers.
        Fix marshalling state set of accessible objects.

        Fix provided by:
                Mario Lang

diff --git a/atk-adaptor/accessible-adaptor.c b/atk-adaptor/accessible-adaptor.c
index 4f03140..1c24e92 100644 (file)
--- a/atk-adaptor/accessible-adaptor.c
+++ b/atk-adaptor/accessible-adaptor.c
@@ -26,6 +26,7 @@
 #include <droute/droute.h>
 
 #include "common/spi-dbus.h"
+#include "common/spi-stateset.h"
 #include "accessible-marshaller.h"
 #include "accessible-register.h"
 

diff --git a/atk-adaptor/accessible-marshaller.c b/atk-adaptor/accessible-marshaller.c
index 80fc86b..0247804 100644 (file)
--- a/atk-adaptor/accessible-marshaller.c
+++ b/atk-adaptor/accessible-marshaller.c
@@ -20,11 +20,16 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <droute/droute.h>
+
 #include "common/spi-dbus.h"
+#include "common/spi-stateset.h"
 
 #include "accessible-register.h"
 #include "accessible-marshaller.h"
 
+#include "adaptors.h"
+
 /*---------------------------------------------------------------------------*/
 
 /*
@@ -182,13 +187,11 @@ spi_atk_append_accessible(AtkObject *obj, gpointer iter)
 {
   DBusMessageIter *iter_array;
   DBusMessageIter iter_struct, iter_sub_array;
-  dbus_int32_t states [2];
+  dbus_uint32_t states [2];
   int count;
 
   const char *name, *desc;
-  int i;
   dbus_uint32_t role;
-  GSList *l;
 
   iter_array = (DBusMessageIter *) iter;
 
@@ -275,7 +278,7 @@ spi_atk_append_accessible(AtkObject *obj, gpointer iter)
       g_free(path);
 
       /* Marshall state set */
-      spi_atk_state_to_dbus_array (obj, &states);
+      spi_atk_state_to_dbus_array (obj, states);
       dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", &iter_sub_array);
       for (count = 0; count < 2; count++)
         {

diff --git a/atk-adaptor/accessible-register.c b/atk-adaptor/accessible-register.c
index 901b8aa..793e0ea 100644 (file)
--- a/atk-adaptor/accessible-register.c
+++ b/atk-adaptor/accessible-register.c
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "bridge.h"
+#include "tree-adaptor.h"
 #include "accessible-register.h"
 
 /*

diff --git a/atk-adaptor/collection-adaptor.c b/atk-adaptor/collection-adaptor.c
index 444c1e1..3c2b11c 100644 (file)
--- a/atk-adaptor/collection-adaptor.c
+++ b/atk-adaptor/collection-adaptor.c
@@ -32,6 +32,7 @@
 
 #include "common/bitarray.h"
 #include "common/spi-dbus.h"
+#include "common/spi-stateset.h"
 
 typedef struct _MatchRulePrivate MatchRulePrivate;
 struct _MatchRulePrivate

diff --git a/atk-adaptor/document-adaptor.c b/atk-adaptor/document-adaptor.c
index badd38a..889abf4 100644 (file)
--- a/atk-adaptor/document-adaptor.c
+++ b/atk-adaptor/document-adaptor.c
@@ -27,6 +27,8 @@
 
 #include "common/spi-dbus.h"
 
+#include "accessible-marshaller.h"
+
 static DBusMessage *
 impl_getLocale (DBusConnection *bus,
                 DBusMessage *message,

diff --git a/atk-adaptor/text-adaptor.c b/atk-adaptor/text-adaptor.c
index de91f6b..dd10b8d 100644 (file)
--- a/atk-adaptor/text-adaptor.c
+++ b/atk-adaptor/text-adaptor.c
@@ -29,6 +29,8 @@
 
 #include "common/spi-dbus.h"
 
+#include "accessible-marshaller.h"
+
 static dbus_bool_t
 impl_get_characterCount (DBusMessageIter * iter,
                          void *user_data)