X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=cspi%2Fspi-private.h;h=795d08d4ec57b0a06bb0cb7d2fba5dd0d12d4d51;hp=3e8926c678c098f42f00d3270e9cbdb9b3da7138;hb=5d374cf95f2447a712f94dd2efe2b294ecab58ca;hpb=6e37a9ea253974a02f72cb65f88007aed0b3c77a

diff --git a/cspi/spi-private.h b/cspi/spi-private.h
index 3e8926c..795d08d 100644
--- a/cspi/spi-private.h
+++ b/cspi/spi-private.h
@@ -27,13 +27,14 @@
 
 /* Private internal implementation details of at-spi. */
 
-#include <spi-common/spi-dbus.h>
-#include <cspi/spi.h>
-#include <string.h>
+#include "common/spi-dbus.h"
+#include "cspi/spi.h"
+#include "string.h"
 #include "cspi/cspi-lowlevel.h"
 #include "cspi/spi-listener.h"
 #include "dbind/dbind.h"
 #include <glib-object.h>
+#include "common/spi-stateset.h"
 
 typedef struct _CSpiApplication CSpiApplication;
 struct _CSpiApplication
@@ -56,11 +57,7 @@ struct _Accessible {
   gint interfaces : 24;
   char *name;
   char *description;
-};
-
-struct _AccessibleStateSet {
-	guint   ref_count;
-	GArray *states;
+  AtkStateSet *states;
 };
 
 #define SPI_INTERNAL_EVENT_MAGIC 0xc3
@@ -83,7 +80,7 @@ struct _SPIException {
   char * desc;
 };
 
-DBusConnection *spi_bus (void);
+DBusConnection *SPI_bus (void);
 SPIBoolean             cspi_exception         (void);
 Accessible            *cspi_object_add (Accessible  *accessible);
 void                   cspi_object_ref        (Accessible  *accessible);
@@ -92,7 +89,7 @@ SPIBoolean             cspi_accessible_is_a   (Accessible  *accessible,
 					       const char  *interface_name);
 AccessibleRole         cspi_role_from_spi_role (Accessibility_Role role);
 void                   cspi_streams_close_all (void);
-gboolean               cspi_exception_throw (DBusError *error, char *desc_prefix);
+gboolean               cspi_exception_throw (DBusError *error, const char *desc_prefix);
 
 AccessibleAttributeSet 
                      *_cspi_attribute_set_from_sequence (const GArray *seq);
@@ -113,10 +110,10 @@ AccessibleAttributeSet
 typedef struct _Accessibility_BoundingBox Accessibility_BoundingBox;
 struct _Accessibility_BoundingBox
 {
-  dbus_uint32_t x;
-  dbus_uint32_t y;
-  dbus_uint32_t width;
-  dbus_uint32_t height;
+  dbus_int32_t x;
+  dbus_int32_t y;
+  dbus_int32_t width;
+  dbus_int32_t height;
 };
 
 #endif /* _SPI_PRIVATE_H_ */