added use of non-preemptive keylistener to simple-at test.

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

diff --git a/libspi/application.h b/libspi/application.h
index ddbb81b..b1c9140 100644 (file)
--- a/libspi/application.h
+++ b/libspi/application.h
@@ -23,15 +23,14 @@
 #ifndef SPI_APPLICATION_H_
 #define SPI_APPLICATION_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+#include <glib/gmacros.h>
 #include <atk/atkobject.h>
-#include <accessible.h>
-#include <application.h>
+#include <libspi/accessible.h>
+#include <libspi/application.h>
 #include <libspi/Accessibility.h>
 
+G_BEGIN_DECLS
+
 #define SPI_APPLICATION_TYPE        (spi_application_get_type ())
 #define SPI_APPLICATION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_APPLICATION_TYPE, SpiApplication))
 #define SPI_APPLICATION_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_APPLICATION_TYPE, SpiApplicationClass))
@@ -46,18 +45,14 @@ typedef struct {
 
 typedef struct {
         SpiAccessibleClass parent_class;
-        POA_Accessibility_SpiApplication__epv epv;
+        POA_Accessibility_Application__epv epv;
        GHashTable *toolkit_event_names;
        GHashTable *generic_event_names;
 } SpiApplicationClass;
 
-GType               spi_application_get_type           (void);
-gboolean            *spi_application_set_id            (AtkObject *app, long id);
-SpiApplication         *spi_application_new               (AtkObject *app_root);
-
+GType           spi_application_get_type (void);
+SpiApplication *spi_application_new      (AtkObject *app_root);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_APPLICATION_H_ */