Added simple scanning to the virtual keyboard demo, to show one way to

[platform/core/uifw/at-spi2-atk.git] / registryd / desktop.h

diff --git a/registryd/desktop.h b/registryd/desktop.h
index d3430f6..7a4e290 100644 (file)
--- a/registryd/desktop.h
+++ b/registryd/desktop.h
@@ -23,16 +23,14 @@
 #ifndef SPI_DESKTOP_H_
 #define SPI_DESKTOP_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <bonobo/bonobo-xobject.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_DESKTOP_TYPE        (spi_desktop_get_type ())
 #define SPI_DESKTOP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_DESKTOP_TYPE, SpiDesktop))
 #define SPI_DESKTOP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_DESKTOP_TYPE, SpiDesktopClass))
@@ -46,7 +44,7 @@ typedef struct {
 
 typedef struct {
         SpiAccessibleClass parent_class;
-        POA_Accessibility_SpiDesktop__epv epv;
+        POA_Accessibility_Desktop__epv epv;
 } SpiDesktopClass;
 
 GType               spi_desktop_get_type           (void);
@@ -54,8 +52,6 @@ void                spi_desktop_add_application    (SpiApplication *app);
 void                spi_desktop_remove_application (SpiApplication *app);
 SpiDesktop             *spi_desktop_new               (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* SPI_DESKTOP_H_ */