2001-12-18 Marc Mulcahy <marc.mulcahy@sun.com>

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

diff --git a/libspi/action.c b/libspi/action.c
index d4dc70d..d0352c5 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -20,24 +20,12 @@
  * 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>
+#include <atk/atkaction.h>
 
 /*
  * Static function declarations
@@ -47,8 +35,6 @@ static void
 spi_action_class_init (SpiActionClass *klass);
 static void
 spi_action_init (SpiAction *action);
-static void
-spi_action_finalize (GObject *obj);
 static CORBA_long
 impl__get_nActions(PortableServer_Servant servant,
                 CORBA_Environment * ev);
@@ -68,53 +54,15 @@ impl_getKeyBinding (PortableServer_Servant servant,
                    const CORBA_long index,
                    CORBA_Environment * ev);
 
-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,
+                      SPI_TYPE_BASE,
+                      spi_action);
 
 static void
 spi_action_class_init (SpiActionClass *klass)
 {
-  GObjectClass * object_class = (GObjectClass *) klass;
   POA_Accessibility_Action__epv *epv = &klass->epv;
-  parent_class = g_type_class_peek_parent (klass);
-
-  object_class->finalize = spi_action_finalize;
-
 
   /* Initialize epv table */
 
@@ -130,67 +78,65 @@ spi_action_init (SpiAction *action)
 {
 }
 
-static void
-spi_action_finalize (GObject *obj)
-{
-  SpiAction *action = SPI_ACTION (obj);
-  g_object_unref (action->atko);
-  action->atko = NULL;
-  parent_class->finalize (obj);
-}
-
 SpiAction *
 spi_action_interface_new (AtkObject *obj)
 {
-  SpiAction *new_action = 
-    SPI_ACTION(g_object_new (SPI_ACTION_TYPE, NULL));
-  new_action->atko = obj;
-  g_object_ref (obj);
+  SpiAction *new_action = g_object_new (SPI_ACTION_TYPE, NULL);
+
+  spi_base_construct (SPI_BASE (new_action), G_OBJECT(obj));
+
   return new_action;
 }
 
+static AtkAction *
+get_action_from_servant (PortableServer_Servant servant)
+{
+  SpiBase *object = SPI_BASE (bonobo_object_from_servant (servant));
+  g_return_val_if_fail (object != NULL, NULL);
+  g_return_val_if_fail (ATK_IS_OBJECT(object->gobj), NULL);
+  return ATK_ACTION (object->gobj);
+}
+
 static CORBA_long
-impl__get_nActions(PortableServer_Servant servant,
-           CORBA_Environment * ev)
+impl__get_nActions (PortableServer_Servant servant,
+                   CORBA_Environment     *ev)
 {
-  SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  return (CORBA_long) atk_action_get_n_actions (ATK_ACTION(action->atko));
+  AtkAction *action = get_action_from_servant (servant);
+  return (CORBA_long) atk_action_get_n_actions (action);
 }
 
 static CORBA_boolean
 impl_doAction (PortableServer_Servant servant,
               const CORBA_long index, CORBA_Environment * ev)
 {
-  SpiAction *action = SPI_ACTION (bonobo_object_from_servant (servant));
-  return (CORBA_boolean) atk_action_do_action (ATK_ACTION(action->atko), (gint) index);
+  AtkAction *action = get_action_from_servant (servant);
+  return (CORBA_boolean) atk_action_do_action (action, (gint) index);
 }
 
-
 static CORBA_string
 impl_getDescription (PortableServer_Servant servant,
                const CORBA_long index,
                CORBA_Environment * ev)
 {
-  SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
+  AtkAction *action = get_action_from_servant (servant);
   const gchar *rv;
   
-  rv = atk_action_get_description (ATK_ACTION(action->atko), (gint) index);
+  rv = atk_action_get_description (action, (gint) index);
   if (rv)
     return CORBA_string_dup (rv);
   else
     return CORBA_string_dup ("");
 }
 
-
 static CORBA_string
 impl_getName (PortableServer_Servant servant,
                const CORBA_long index,
                CORBA_Environment * ev)
 {
-  SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
+  AtkAction *action = get_action_from_servant (servant);
   const gchar *rv;
   
-  rv = atk_action_get_name (ATK_ACTION(action->atko), (gint) index);
+  rv = atk_action_get_name (action, (gint) index);
   if (rv)
     return CORBA_string_dup (rv);
   else
@@ -202,10 +148,10 @@ impl_getKeyBinding (PortableServer_Servant servant,
                    const CORBA_long index,
                    CORBA_Environment * ev)
 {
-  SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
+  AtkAction *action = get_action_from_servant (servant);
   const gchar *rv;
   
-  rv = atk_action_get_keybinding (ATK_ACTION(action->atko), (gint) index);
+  rv = atk_action_get_keybinding (action, (gint) index);
   if (rv)
     return CORBA_string_dup (rv);
   else