Removed po directory from Makefile.am for now.

[platform/core/uifw/at-spi2-atk.git] / libspi / action.h

diff --git a/libspi/action.h b/libspi/action.h
index 88faf1c..7396b4b 100644 (file)
--- a/libspi/action.h
+++ b/libspi/action.h
@@ -20,14 +20,9 @@
 #ifndef SPI_ACTION_H_
 #define SPI_ACTION_H_
 
+#include <libspi/base.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
+G_BEGIN_DECLS
 
 #define SPI_ACTION_TYPE        (spi_action_get_type ())
 #define SPI_ACTION(obj)          (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPI_ACTION_TYPE, SpiAction))
@@ -35,27 +30,21 @@ extern "C" {
 #define SPI_IS_ACTION(obj)       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPI_ACTION_TYPE))
 #define SPI_IS_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPI_ACTION_TYPE))
 
-typedef struct _SpiAction SpiAction;
-typedef struct _SpiActionClass SpiActionClass;
+typedef struct _Action SpiAction;
+typedef struct _ActionClass SpiActionClass;
 
-struct _SpiAction {
-  BonoboObject parent;
-  AtkObject *atko;
+struct _Action {
+  SpiBase parent;
 };
 
-struct _SpiActionClass {
-  BonoboObjectClass parent_class;
-  POA_Accessibility_SpiAction__epv epv;
+struct _ActionClass {
+  SpiBaseClass parent_class;
+  POA_Accessibility_Action__epv epv;
 };
 
-GType
-spi_action_get_type   (void);
-
-SpiAction *
-spi_action_interface_new       (AtkObject *obj);
+GType      spi_action_get_type      (void);
+SpiAction *spi_action_interface_new (AtkObject *obj);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_ACTION_H_ */