Started fixing IDL docs.

[platform/core/uifw/at-spi2-atk.git] / libspi / action.c

diff --git a/libspi/action.c b/libspi/action.c
index d4dc70d..1a23332 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -20,24 +20,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* component.c : bonobo wrapper for accessible component implementation */
 
+#include <config.h>
 #include <stdio.h>
-
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the SpiAction bonobo object
- */
-#include "action.h"
+#include <libspi/action.h>
 
 /*
  * Static function declarations
@@ -70,41 +57,10 @@ impl_getKeyBinding (PortableServer_Servant servant,
 
 static GObjectClass *parent_class;
 
-GType
-spi_action_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (SpiActionClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) spi_action_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (SpiAction),
-      0, /* n preallocs */
-      (GInstanceInitFunc) spi_action_init,
-                        NULL /* value table */
-    };
-
-    /*
-     * Bonobo_type_unique auto-generates a load of
-     * CORBA structures for us. All derived types must
-     * use bonobo_type_unique.
-     */
-    type = bonobo_type_unique (
-                              BONOBO_OBJECT_TYPE,
-                              POA_Accessibility_Action__init,
-                              NULL,
-                              G_STRUCT_OFFSET (SpiActionClass, epv),
-                              &tinfo,
-                              "SpiAccessibleAction");
-  }
-
-  return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiAction,
+                      Accessibility_Action,
+                      BONOBO_TYPE_OBJECT,
+                      spi_action);
 
 static void
 spi_action_class_init (SpiActionClass *klass)
@@ -142,8 +98,7 @@ spi_action_finalize (GObject *obj)
 SpiAction *
 spi_action_interface_new (AtkObject *obj)
 {
-  SpiAction *new_action = 
-    SPI_ACTION(g_object_new (SPI_ACTION_TYPE, NULL));
+  SpiAction *new_action = g_object_new (SPI_ACTION_TYPE, NULL);
   new_action->atko = obj;
   g_object_ref (obj);
   return new_action;