* atk-bridge/bridge.c:

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

diff --git a/registryd/registry.h b/registryd/registry.h
index dbb7a81..d7109ef 100644 (file)
--- a/registryd/registry.h
+++ b/registryd/registry.h
@@ -25,8 +25,11 @@
 
 #include <glib/gmain.h>
 #include <libspi/listener.h>
-#include <libspi/desktop.h>
-#include <libspi/deviceeventcontroller.h>
+
+typedef struct _SpiRegistry SpiRegistry;
+
+#include "desktop.h"
+#include "deviceeventcontroller.h"
 
 G_BEGIN_DECLS
 
@@ -36,19 +39,20 @@ G_BEGIN_DECLS
 #define SPI_IS_REGISTRY(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), SPI_REGISTRY_TYPE))
 #define SPI_IS_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_REGISTRY_TYPE))
 
-typedef struct {
-  SpiListener parent;
-  GList *object_listeners;
-  GList *window_listeners;
-  GList *toolkit_listeners;
-  struct SpiDeviceEventController *device_event_controller;
-  SpiDesktop *desktop;
-  gboolean (*kbd_event_hook) (gpointer source);
-} SpiRegistry;
+struct _SpiRegistry {
+  SpiListener      parent;
+
+  GList           *object_listeners;
+  GList           *window_listeners;
+  GList           *toolkit_listeners;
+  SpiDEController *de_controller;
+  SpiDesktop      *desktop;
+};
 
 typedef struct {
-        SpiListenerClass parent_class;
-        POA_Accessibility_Registry__epv epv;
+  SpiListenerClass parent_class;
+
+  POA_Accessibility_Registry__epv epv;
 } SpiRegistryClass;
 
 GType        spi_registry_get_type (void);