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

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_action.c

diff --git a/cspi/spi_action.c b/cspi/spi_action.c
index f00dd83..2846e72 100644 (file)
--- a/cspi/spi_action.c
+++ b/cspi/spi_action.c
@@ -1,32 +1,30 @@
-#include "spi-util.h"
-
 int
-AccessibleAction_ref (
-                      AccessibleAction *obj)
+SpiAccessibleAction_ref (
+                      SpiAccessibleAction *obj)
 {
   Accessibility_Action_ref (*obj, &ev);
   return 0;
 }
 
 int
-AccessibleAction_unref (AccessibleAction *obj)
+SpiAccessibleAction_unref (SpiAccessibleAction *obj)
 {
   Accessibility_Action_unref (*obj, &ev);
-  eturn 0;
+  return 0;
 }
 
 
 
 long
-AccessibleAction_getNActions (AccessibleAction *obj)
+SpiAccessibleAction_getNActions (SpiAccessibleAction *obj)
 {
   return (long)
-    Accessibility_Action_getNActions (*obj, &ev);
+    Accessibility_Action__get_nActions (*obj, &ev);
 }
 
 
 /**
- * AccessibleAction_getDescription:
+ * SpiAccessibleAction_getDescription:
  * @obj: a pointer to the #AccessibleAction to query.
  *
  * Get the description of 'i-th' action invokable on an
@@ -38,42 +36,42 @@ AccessibleAction_getNActions (AccessibleAction *obj)
  *
  **/
 char *
-AccessibleAction_getDescription (AccessibleAction *obj,
+SpiAccessibleAction_getDescription (SpiAccessibleAction *obj,
                                  long index)
 {
-  return string_from_corba_string (
-                                  Accessibility_Action_getDescription (*obj,
-                                      (CORBA_long) index,
-                                                                       &ev));
+  return (char *)
+    Accessibility_Action_getDescription (*obj,
+                                        (CORBA_long) index,
+                                        &ev);
 }
 
 
 
 char *
-AccessibleAction_getKeyBinding (AccessibleAction *obj,
-                                long index)
+SpiAccessibleAction_getKeyBinding (SpiAccessibleAction *obj,
+                               long index)
 {
-  return string_from_corba_string (
-                                  Accessibility_Action_getKeybinding (*obj,
-                                                                      (CORBA_long) index,
-                                                                      &ev));
+  return (char *) 
+    Accessibility_Action_getKeyBinding (*obj,
+       (CORBA_long) index,
+       &ev);
 }
 
 
 
 char *
-AccessibleAction_getName (AccessibleAction *obj,
+SpiAccessibleAction_getName (SpiAccessibleAction *obj,
                          long index)
 {
-  return string_from_corba_string (
+  return (char *)
                                   Accessibility_Action_getName (*obj,
                                                                 (CORBA_long) index,
-                                                                &ev));
+                                                                &ev);
 }
 
 
 boolean
-AccessibleAction_doAction (AccessibleAction *obj,
+SpiAccessibleAction_doAction (SpiAccessibleAction *obj,
                            long index)
 {
   return (boolean)