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

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

diff --git a/registryd/registry.h b/registryd/registry.h
index 18fe392..68ec403 100644 (file)
--- a/registryd/registry.h
+++ b/registryd/registry.h
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -20,42 +21,40 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef REGISTRY_H_
-#define REGISTRY_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include <libspi/Accessibility.h>
-#include "listener.h"
-#include "desktop.h"
-
-#define REGISTRY_TYPE        (registry_get_type ())
-#define REGISTRY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), REGISTRY_TYPE, Registry))
-#define REGISTRY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), REGISTRY_TYPE, RegistryClass))
-#define IS_REGISTRY(o)       (G_TYPE_CHECK__INSTANCE_TYPE ((o), REGISTRY_TYPE))
-#define IS_REGISTRY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), REGISTRY_TYPE))
-
-typedef struct {
-  Listener parent;
-  GList *focus_listeners;
-  GList *window_listeners;
-  GList *toolkit_listeners;
-  GList *applications;
-  Desktop *desktop;
-} Registry;
-
-typedef struct {
-        ListenerClass parent_class;
-        POA_Accessibility_Registry__epv epv;
-} RegistryClass;
-
-GType               registry_get_type   (void);
-Registry            *registry_new       (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* REGISTRY_H_ */
+#ifndef SPI_REGISTRY_H_
+#define SPI_REGISTRY_H_
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <droute/droute.h>
+
+typedef struct _SpiRegistry SpiRegistry;
+typedef struct _SpiRegistryClass SpiRegistryClass;
+
+G_BEGIN_DECLS
+
+#define SPI_REGISTRY_TYPE        (spi_registry_get_type ())
+#define SPI_REGISTRY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_REGISTRY_TYPE, SpiRegistry))
+#define SPI_REGISTRY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_REGISTRY_TYPE, SpiRegistryClass))
+#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))
+
+struct _SpiRegistry {
+  GObject      parent;
+  GSequence   *apps;
+
+  DBusConnection *bus;
+};
+
+struct _SpiRegistryClass {
+  GObjectClass parent_class;
+};
+
+GType        spi_registry_get_type (void);
+SpiRegistry *spi_registry_new      (DBusConnection *bus,
+                                    DRouteContext  *droute);
+
+G_END_DECLS
+
+#endif /* SPI_REGISTRY_H_ */