-#define CSPI_OBJREF(a) (((Accessible *)(a))->objref)
-
-CORBA_Environment *cspi_ev (void);
-SPIBoolean cspi_exception (void);
-Accessibility_Registry cspi_registry (void);
-Accessible *cspi_object_add (CORBA_Object corba_object);
-Accessible *cspi_object_add_check (CORBA_Object corba_object);
-void cspi_object_ref (Accessible *accessible);
-void cspi_object_unref (Accessible *accessible);
-SPIBoolean cspi_accessible_is_a (Accessible *obj,
- const char *interface_name);
-SPIBoolean cspi_warn_ev (CORBA_Environment *ev,
- const char *error_string);
-void cspi_check_ev (CORBA_Environment *ev,
- const char *error_string);
+#define SPI_INTERNAL_EVENT_MAGIC 0xc3
+/*
+ * For internal use by CSPI implementation only
+ */
+typedef struct {
+ AccessibleEvent event;
+ guint id;
+ guchar magic;
+ guchar type;
+ guint16 ref_count;
+} InternalEvent;
+
+struct _SPIException {
+ SPIExceptionType type;
+ Accessible *source;
+ DBusError *error;
+ SPIExceptionCode code;
+ char * desc;
+};
+
+DBusConnection *SPI_bus (void);
+SPIBoolean cspi_exception (void);
+Accessible *cspi_object_add (Accessible *accessible);
+void cspi_object_ref (Accessible *accessible);
+void cspi_object_unref (Accessible *accessible);
+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, const char *desc_prefix);
+
+AccessibleAttributeSet
+ *_cspi_attribute_set_from_sequence (const GArray *seq);
+#define cspi_return_if_fail(val) \
+ if (!(val)) \
+ return
+#define cspi_return_val_if_fail(val, ret) \
+ if (!(val)) \
+ return (ret)
+
+#define cspi_return_if_ev(err) \
+ if (cspi_exception ()) \
+ return;
+#define cspi_return_val_if_ev(err, ret) \
+ if (cspi_exception ()) \
+ return (ret);
+
+typedef struct _Accessibility_BoundingBox Accessibility_BoundingBox;
+struct _Accessibility_BoundingBox
+{
+ dbus_int32_t x;
+ dbus_int32_t y;
+ dbus_int32_t width;
+ dbus_int32_t height;
+};