Merge branch 'testing' of ../git-at-spi

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

diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index 14cb16f..3fa5c8e 100644 (file)
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -24,9 +24,8 @@
 #ifndef SPI_DEVICE_EVENT_CONTROLLER_H_
 #define SPI_DEVICE_EVENT_CONTROLLER_H_
 
-#include <bonobo/bonobo-object.h>
-#include <libspi/Accessibility.h>
-#include <libspi/devicelistener.h>
+#include <X11/Xlib.h>
+#include <gdk/gdk.h>
 
 typedef struct _SpiDEController SpiDEController;
 
@@ -42,18 +41,17 @@ G_BEGIN_DECLS
 #define SPI_DEVICE_EVENT_CONTROLLER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SPI_DEVICE_EVENT_CONTROLLER_TYPE, SpiDEControllerClass))
 
 struct _SpiDEController {
-       BonoboObject parent;
+       GObject parent;
        
        SpiRegistry *registry;
        GList       *key_listeners;
        GList       *mouse_listeners;
        GList       *keygrabs_list;
+       Display     *xevie_display;
 };
 
 typedef struct {
-  BonoboObjectClass parent_class;
-
-  POA_Accessibility_DeviceEventController__epv epv;
+  GObjectClass parent_class;
 } SpiDEControllerClass;
 
 GType            spi_device_event_controller_get_type (void);