2008-07-21 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/cspi/spi_action.c b/cspi/spi_action.c
index adfd1d1..7136b45 100644 (file)
--- a/cspi/spi_action.c
+++ b/cspi/spi_action.c
@@ -58,12 +58,11 @@ AccessibleAction_unref (AccessibleAction *obj)
 long
 AccessibleAction_getNActions (AccessibleAction *obj)
 {
-  long retval;
+  dbus_int32_t retval;
 
   cspi_return_val_if_fail (obj != NULL, -1);
 
-  retval =
-    Accessibility_Action__get_nActions (CSPI_OBJREF (obj), cspi_ev ());
+  cspi_dbus_get_property (obj, spi_interface_action, "nActions", NULL, "i", &retval);
 
   cspi_return_val_if_ev ("getNActions", -1);
 
@@ -84,13 +83,11 @@ char *
 AccessibleAction_getDescription (AccessibleAction *obj,
                                  long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-    Accessibility_Action_getDescription (CSPI_OBJREF (obj),
-                                        i,
-                                        cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getDescription", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getDescription", NULL);
 
@@ -131,14 +128,11 @@ char *
 AccessibleAction_getKeyBinding (AccessibleAction *obj,
                                long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
-
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-    Accessibility_Action_getKeyBinding (CSPI_OBJREF (obj),
-       i,
-       cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getKeyBinding", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getKeyBinding", NULL);
 
@@ -159,14 +153,11 @@ char *
 AccessibleAction_getName (AccessibleAction *obj,
                          long int          i)
 {
+  dbus_int32_t d_i = i;
   char *retval;
-
   cspi_return_val_if_fail (obj != NULL, NULL);
 
-  retval =
-   Accessibility_Action_getName (CSPI_OBJREF (obj),
-                                i,
-                                cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "getName", NULL, "i=>s", d_i, &retval);
 
   cspi_return_val_if_ev ("getName", NULL);
 
@@ -186,13 +177,12 @@ SPIBoolean
 AccessibleAction_doAction (AccessibleAction *obj,
                            long int i)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_i = i;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_Action_doAction (CSPI_OBJREF (obj),
-                                  i,
-                                  cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_action, "doAction", NULL, "i=>b", d_i, &retval);
 
   cspi_return_val_if_ev ("doAction", FALSE);