Some refactoring to remove duplicate code and other clean-ups

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

diff --git a/common/spi-dbus.h b/atk-adaptor/spi-dbus.h
similarity index 62%
rename from common/spi-dbus.h
rename to atk-adaptor/spi-dbus.h
index 1c10211..61a43be 100644 (file)
--- a/common/spi-dbus.h
+++ b/atk-adaptor/spi-dbus.h
@@ -25,7 +25,7 @@
 #define SPI_DBUS_H_
 
 #include <glib.h>
-#include <common/spi-types.h>
+#include <atspi/atspi.h>
 
 #define DBG(a,b) if(_dbg>=(a))b
 
@@ -38,38 +38,14 @@ extern int _dbg;
 #define SPI_DBUS_PATH_NULL "/org/a11y/atspi/null"
 #define SPI_DBUS_PATH_ROOT "/org/a11y/atspi/accessible/root"
 
-#define SPI_DBUS_PATH_DEC "/org/a11y/atspi/registry/deviceeventcontroller"
-#define SPI_DBUS_INTERFACE_DEC "org.a11y.atspi.DeviceEventController"
-#define SPI_DBUS_INTERFACE_DEVICE_EVENT_LISTENER "org.a11y.atspi.DeviceEventListener"
-
-#define SPI_DBUS_INTERFACE_CACHE "org.a11y.atspi.Cache"
-#define SPI_DBUS_INTERFACE_ACCESSIBLE "org.a11y.atspi.Accessible"
-#define SPI_DBUS_INTERFACE_ACTION "org.a11y.atspi.Action"
-#define SPI_DBUS_INTERFACE_APPLICATION "org.a11y.atspi.Application"
-#define SPI_DBUS_INTERFACE_COLLECTION "org.a11y.atspi.Collection"
-#define SPI_DBUS_INTERFACE_COMPONENT "org.a11y.atspi.Component"
-#define SPI_DBUS_INTERFACE_DESKTOP "org.a11y.atspi.Desktop"
-#define SPI_DBUS_INTERFACE_DOCUMENT "org.a11y.atspi.Document"
-#define SPI_DBUS_INTERFACE_EDITABLE_TEXT "org.a11y.atspi.EditableText"
-#define SPI_DBUS_INTERFACE_EVENT_KEYBOARD "org.a11y.atspi.Event.Keyboard"
-#define SPI_DBUS_INTERFACE_EVENT_MOUSE "org.a11y.atspi.Event.Mouse"
-#define SPI_DBUS_INTERFACE_HYPERLINK "org.a11y.atspi.Hyperlink"
-#define SPI_DBUS_INTERFACE_HYPERTEXT "org.a11y.atspi.Hypertext"
-#define SPI_DBUS_INTERFACE_IMAGE "org.a11y.atspi.Image"
-#define SPI_DBUS_INTERFACE_SELECTION "org.a11y.atspi.Selection"
-#define SPI_DBUS_INTERFACE_TABLE "org.a11y.atspi.Table"
-#define SPI_DBUS_INTERFACE_TEXT "org.a11y.atspi.Text"
-#define SPI_DBUS_INTERFACE_VALUE "org.a11y.atspi.Value"
-#define SPI_DBUS_INTERFACE_SOCKET "org.a11y.atspi.Socket"
-
 DBusMessage *spi_dbus_general_error(DBusMessage *message);
 DBusMessage *spi_dbus_return_rect(DBusMessage *message, gint ix, gint iy, gint iwidth, gint iheight);
 
 void spi_dbus_emit_valist(DBusConnection *bus, const char *path, const char *interface, const char *name, int first_arg_type, va_list args);
 dbus_bool_t spi_dbus_message_iter_get_struct(DBusMessageIter *iter, ...);
 dbus_bool_t spi_dbus_message_iter_append_struct(DBusMessageIter *iter, ...);
-dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const Accessibility_DeviceEvent *e);
-dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, Accessibility_DeviceEvent *e);
+dbus_bool_t spi_dbus_marshal_deviceEvent(DBusMessage *message, const AtspiDeviceEvent *e);
+dbus_bool_t spi_dbus_demarshal_deviceEvent(DBusMessage *message, AtspiDeviceEvent *e);
 dbus_bool_t spi_dbus_get_simple_property (DBusConnection *bus, const char *dest, const char *path, const char *interface, const char *prop, int *type, void *ptr, DBusError *error);
 void spi_dbus_emit_signal(DBusConnection *bus, const char *path, const char *klass, const char *major, const char *minor, dbus_int32_t detail1, dbus_int32_t detail2, const char *type, const void *val);
 /*