2008-12-17 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/registryd/deviceeventcontroller.h b/registryd/deviceeventcontroller.h
index 90ebb0d..fb00a37 100644 (file)
--- a/registryd/deviceeventcontroller.h
+++ b/registryd/deviceeventcontroller.h
@@ -24,9 +24,9 @@
 #ifndef SPI_DEVICE_EVENT_CONTROLLER_H_
 #define SPI_DEVICE_EVENT_CONTROLLER_H_
 
-#include <bonobo/bonobo-object.h>
-#include <libspi/Accessibility.h>
-#include <libspi/keystrokelistener.h>
+#include <X11/Xlib.h>
+#include <gdk/gdk.h>
+#include <droute/droute.h>
 
 typedef struct _SpiDEController SpiDEController;
 
@@ -42,22 +42,25 @@ 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;
-       
-       SpiRegistry *registry;
-       GList       *key_listeners;
-       GList       *mouse_listeners;
-       GList       *keygrabs_list;
+       GObject parent;
+       DBusConnection *bus;
+       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);
-SpiDEController *spi_device_event_controller_new      (SpiRegistry *registry);
+SpiDEController *spi_device_event_controller_new      (SpiRegistry    *registry,
+                                                       DBusConnection *bus,
+                                                       DRouteContext  *droute);
+
+void spi_remove_device_listeners (SpiDEController *controller, const char *bus_name);
 
 G_END_DECLS