Merge branch 'mgorse' of ssh://git.codethink.co.uk/git/atspi-dbus into droute

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

diff --git a/registryd/registry.h b/registryd/registry.h
index 9254543..ead4fcb 100644 (file)
--- a/registryd/registry.h
+++ b/registryd/registry.h
@@ -25,8 +25,6 @@
 #define SPI_REGISTRY_H_
 
 #include <glib/gmain.h>
-#include <gdk/gdk.h>
-#include <libspi/listener.h>
 
 typedef struct _SpiRegistry SpiRegistry;
 
@@ -42,7 +40,7 @@ G_BEGIN_DECLS
 #define SPI_IS_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_REGISTRY_TYPE))
 
 struct _SpiRegistry {
-  SpiListener      parent;
+  GObject      parent;
 
   GList           *object_listeners;
   GList           *window_listeners;
@@ -50,19 +48,26 @@ struct _SpiRegistry {
   GQueue          *deferred_event_queue;
   gboolean         is_queueing;
   guint            exit_notify_timeout;
+  guint            queue_handler_id;
+  char *focus_object_bus;
+  char *focus_object_path;
   SpiDEController *de_controller;
   SpiDesktop      *desktop;
+  DRouteData droute;
 };
 
 typedef struct {
-  SpiListenerClass parent_class;
-
-  POA_Accessibility_Registry__epv epv;
+  GObjectClass parent_class;
 } SpiRegistryClass;
 
 GType        spi_registry_get_type (void);
 SpiRegistry *spi_registry_new      (void);
 
+void spi_registry_emit(SpiRegistry *registry, const char *name, int first_arg_type, ...);
+
+void spi_registry_initialize_registry_interface (DRouteData * data);
+void spi_registry_initialize_dec_interface (DRouteData * data);
+void spi_registry_initialize_desktop_interface (DRouteData * data);
 G_END_DECLS
 
 #endif /* SPI_REGISTRY_H_ */