Removed po directory from Makefile.am for now.

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

diff --git a/libspi/desktop.h b/libspi/desktop.h
index 87866e7..8c60834 100644 (file)
--- a/libspi/desktop.h
+++ b/libspi/desktop.h
@@ -20,42 +20,36 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef DESKTOP_H_
-#define DESKTOP_H_
+#ifndef SPI_DESKTOP_H_
+#define SPI_DESKTOP_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <libspi/accessible.h>
 
-#include <bonobo/bonobo-xobject.h>
-#include <atk/atkobject.h>
-#include <accessible.h>
-#include <application.h>
-#include <libspi/Accessibility.h>
+G_BEGIN_DECLS
 
-#define DESKTOP_TYPE        (desktop_get_type ())
-#define DESKTOP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), DESKTOP_TYPE, Desktop))
-#define DESKTOP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), DESKTOP_TYPE, DesktopClass))
-#define IS_DESKTOP(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), DESKTOP_TYPE))
-#define IS_DESKTOP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), DESKTOP_TYPE))
+#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))
+#define SPI_IS_DESKTOP(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_DESKTOP_TYPE))
+#define SPI_IS_DESKTOP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_DESKTOP_TYPE))
 
 typedef struct {
-        Accessible parent;
-        GList *applications; /* TODO: maybe change this so it's generated on-demand ? */
-} Desktop;
+        SpiAccessible parent;
+        GList        *applications;
+} SpiDesktop;
 
 typedef struct {
-        AccessibleClass parent_class;
+        SpiAccessibleClass parent_class;
         POA_Accessibility_Desktop__epv epv;
-} DesktopClass;
+} SpiDesktopClass;
 
-GType               desktop_get_type           (void);
-void                desktop_add_application    (Application *app);
-void                desktop_remove_application (Application *app);
-Desktop             *desktop_new               (void);
+GType       spi_desktop_get_type           (void);
+SpiDesktop *spi_desktop_new                (void);
+void        spi_desktop_add_application    (SpiDesktop *desktop,
+                                           const Accessibility_Application application);
+void        spi_desktop_remove_application (SpiDesktop *desktop,
+                                           const Accessibility_Application application);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* DESKTOP_H_ */
+#endif /* SPI_DESKTOP_H_ */