2001-12-10 Michael Meeks <michael@ximian.com>

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

diff --git a/cspi/spi_application.c b/cspi/spi_application.c
index 9b27062..d6ec2aa 100644 (file)
--- a/cspi/spi_application.c
+++ b/cspi/spi_application.c
@@ -1,10 +1,11 @@
-
 /*
  *
  * AccessibleApplication function prototypes
  *
  */
 
+#include <cspi/spi-private.h>
+
 /**
  * AccessibleApplication_ref:
  * @obj: a pointer to the #AccessibleApplication on which to operate.
@@ -12,13 +13,11 @@
  * Increment the reference count for an #AccessibleApplication.
  *
  * Returns: (no return code implemented yet).
- *
  **/
-int
+void
 AccessibleApplication_ref (AccessibleApplication *obj)
 {
-  Accessibility_Application_ref (*obj, &ev);
-  return 0;
+  cspi_object_ref (obj);
 }
 
 /**
@@ -28,13 +27,11 @@ AccessibleApplication_ref (AccessibleApplication *obj)
  * Decrement the reference count for an #AccessibleApplication.
  *
  * Returns: (no return code implemented yet).
- *
  **/
-int
+void
 AccessibleApplication_unref (AccessibleApplication *obj)
 {
-  Accessibility_Application_unref (*obj, &ev);
-  return 0;
+  cspi_object_unref (obj);
 }
 
 /**
@@ -45,12 +42,21 @@ AccessibleApplication_unref (AccessibleApplication *obj)
  *
  * Returns: a UTF-8 string indicating which UI toolkit is
  *          used by an application.
- *
  **/
 char *
 AccessibleApplication_getToolkitName (AccessibleApplication *obj)
 {
-  return Accessibility_Application__get_toolkitName (*obj, &ev);
+  char *retval;
+
+  cspi_return_val_if_fail (obj != NULL, NULL);
+
+  retval =
+    Accessibility_Application__get_toolkitName (CSPI_OBJREF (obj),
+                                               cspi_ev ());
+
+  cspi_return_val_if_ev ("toolkitName", NULL);
+
+  return retval;
 }
 
 /**
@@ -62,12 +68,21 @@ AccessibleApplication_getToolkitName (AccessibleApplication *obj)
  *
  * Returns: a UTF-8 string indicating the application's
  *          at-spi version.
- *
  **/
 char *
 AccessibleApplication_getVersion (AccessibleApplication *obj)
 {
-  return Accessibility_Application__get_version (*obj, &ev);
+  char *retval;
+
+  cspi_return_val_if_fail (obj != NULL, NULL);
+
+  retval =
+    Accessibility_Application__get_version (CSPI_OBJREF (obj),
+                                           cspi_ev ());
+
+  cspi_return_val_if_ev ("getVersion", NULL);
+
+  return retval;
 }
 
 /**
@@ -80,14 +95,25 @@ AccessibleApplication_getVersion (AccessibleApplication *obj)
  *
  * Returns: a unique #long integer associated with the application
  *          by the Registry, or 0 if the application is not registered.
+**/
 long
 AccessibleApplication_getID (AccessibleApplication *obj)
 {
-  return Accessibility_Application__get_id (*obj, &ev);
+  long retval;
+
+  cspi_return_val_if_fail (obj != NULL, 0);
+
+  retval = Accessibility_Application__get_id (CSPI_OBJREF (obj),
+                                             cspi_ev ());
+
+  cspi_return_val_if_ev ("get_id", 0);
+
+  return retval;
 }
 
 /**
  * AccessibleApplication_pause:
+ * @obj: a pointer to the #Accessible object on which to operate.
  *
  * Attempt to pause the application (used when client event queue is
  *  over-full).
@@ -96,7 +122,7 @@ AccessibleApplication_getID (AccessibleApplication *obj)
  * Returns: #TRUE if the application was paused successfully, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleApplication_pause (AccessibleApplication *obj)
 {
   return FALSE;
@@ -104,6 +130,7 @@ AccessibleApplication_pause (AccessibleApplication *obj)
 
 /**
  * AccessibleApplication_resume:
+ * @obj: a pointer to the #Accessible object on which to operate.
  *
  * Attempt to resume the application (used after #AccessibleApplication_pause).
  * Not Yet Implemented.
@@ -111,10 +138,8 @@ AccessibleApplication_pause (AccessibleApplication *obj)
  * Returns: #TRUE if application processing resumed successfully, #FALSE otherwise.
  *
  **/
-boolean
+SPIBoolean
 AccessibleApplication_resume (AccessibleApplication *obj)
 {
   return FALSE;
 }
-
-