added use of non-preemptive keylistener to simple-at test.

[platform/core/uifw/at-spi2-atk.git] / registryd / desktop.c

diff --git a/registryd/desktop.c b/registryd/desktop.c
index b21fdfe..82dfd92 100644 (file)
--- a/registryd/desktop.c
+++ b/registryd/desktop.c
@@ -20,48 +20,32 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * desktop.c: implements Desktop.idl
- *
- */
-
-/* #include <config.h> */
-#include <libbonobo.h>
+/* desktop.c: implements SpiDesktop.idl */
 
+#include <config.h>
 #include <stdio.h>
+#include <libbonobo.h>
+#include <libspi/desktop.h>
 
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition for the BonoboObject (Gtk Type)
- */
-#include "desktop.h"
-
-/*
- * Our parent Gtk object type
- */
-#define PARENT_TYPE ACCESSIBLE_TYPE
+/* Our parent Gtk object type */
+#define PARENT_TYPE SPI_ACCESSIBLE_TYPE
 
-/*
- * A pointer to our parent object class
- */
-static AccessibleClass *parent_class;
+/* A pointer to our parent object class */
+static SpiAccessibleClass *parent_class;
 
 static void
-desktop_init (Desktop  *desktop)
+spi_desktop_init (SpiDesktop  *desktop)
 {
-  ACCESSIBLE (desktop)->atko = atk_simple_object_new();
-  atk_object_set_name (ATK_OBJECT (ACCESSIBLE (desktop)->atko), "main");
+  SPI_ACCESSIBLE (desktop)->atko = g_object_new (ATK_TYPE_OBJECT, NULL);
+  desktop->applications = NULL;
+  atk_object_set_name (ATK_OBJECT (SPI_ACCESSIBLE (desktop)->atko), "main");
 }
 
 static CORBA_long
 impl_desktop_get_child_count (PortableServer_Servant servant,
                               CORBA_Environment * ev)
 {
-  Desktop *desktop = DESKTOP (bonobo_object_from_servant (servant));
+  SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant));
   if (desktop->applications)
     {
       return g_list_length (desktop->applications);
@@ -77,7 +61,7 @@ impl_desktop_get_child_at_index (PortableServer_Servant servant,
                                  const CORBA_long index,
                                  CORBA_Environment * ev)
 {
-  Desktop *desktop = DESKTOP (bonobo_object_from_servant (servant));
+  SpiDesktop *desktop = SPI_DESKTOP (bonobo_object_from_servant (servant));
   CORBA_Object retval;
   if ((desktop->applications) && (index < g_list_length (desktop->applications)))
     {
@@ -97,57 +81,26 @@ impl_desktop_get_child_at_index (PortableServer_Servant servant,
 }
 
 static void
-desktop_class_init (DesktopClass  *klass)
+spi_desktop_class_init (SpiDesktopClass  *klass)
 {
-        AccessibleClass * accessible_class = (AccessibleClass *) klass;
-        POA_Accessibility_Accessible__epv *epv = &accessible_class->epv;
+        SpiAccessibleClass * spi_accessible_class = (SpiAccessibleClass *) klass;
+        POA_Accessibility_Accessible__epv *epv = &spi_accessible_class->epv;
 
-        parent_class = g_type_class_ref (ACCESSIBLE_TYPE);
+        parent_class = g_type_class_ref (SPI_ACCESSIBLE_TYPE);
 
         epv->_get_childCount = impl_desktop_get_child_count;
         epv->getChildAtIndex = impl_desktop_get_child_at_index;
 }
 
-GType
-desktop_get_type (void)
-{
-        static GType type = 0;
-
-        if (!type) {
-                static const GTypeInfo tinfo = {
-                        sizeof (DesktopClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) desktop_class_init,
-                        (GClassFinalizeFunc) NULL,
-                        NULL, /* class data */
-                        sizeof (Desktop),
-                        0, /* n preallocs */
-                        (GInstanceInitFunc) desktop_init,
-                        NULL /* value table */
-                };
-                /*
-                 *   Here we use bonobo_type_unique instead of
-                 * gtk_type_unique, this auto-generates a load of
-                 * CORBA structures for us. All derived types must
-                 * use bonobo_type_unique.
-                 */
-                type = bonobo_type_unique (
-                        PARENT_TYPE,
-                        POA_Accessibility_Desktop__init,
-                        NULL,
-                        G_STRUCT_OFFSET (DesktopClass, epv),
-                        &tinfo,
-                        "Desktop");
-        }
+BONOBO_TYPE_FUNC_FULL (SpiDesktop,
+                      Accessibility_Desktop,
+                      PARENT_TYPE,
+                      spi_desktop);
 
-        return type;
-}
-
-Desktop *
-desktop_new (void)
+SpiDesktop *
+spi_desktop_new (void)
 {
-    Desktop *retval =
-               DESKTOP (g_object_new (desktop_get_type (), NULL));
+    SpiDesktop *retval = g_object_new (SPI_DESKTOP_TYPE, NULL);
+
     return retval;
 }