2001-11-19 Michael Meeks <michael@ximian.com>

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

diff --git a/libspi/action.c b/libspi/action.c
index 1c05d7e..7024a7a 100644 (file)
--- a/libspi/action.c
+++ b/libspi/action.c
@@ -70,41 +70,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_OBJECT_TYPE,
+                      spi_action);
 
 static void
 spi_action_class_init (SpiActionClass *klass)
@@ -172,7 +141,7 @@ impl_getDescription (PortableServer_Servant servant,
                CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_description (ATK_ACTION(action->atko), (gint) index);
   if (rv)
@@ -188,7 +157,7 @@ impl_getName (PortableServer_Servant servant,
                CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_name (ATK_ACTION(action->atko), (gint) index);
   if (rv)
@@ -203,7 +172,7 @@ impl_getKeyBinding (PortableServer_Servant servant,
                    CORBA_Environment * ev)
 {
   SpiAction *action = SPI_ACTION (bonobo_object_from_servant(servant));
-  CORBA_char *rv;
+  const gchar *rv;
   
   rv = atk_action_get_keybinding (ATK_ACTION(action->atko), (gint) index);
   if (rv)