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

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

diff --git a/cspi/spi_image.c b/cspi/spi_image.c
index a4ede04..e6113e4 100644 (file)
--- a/cspi/spi_image.c
+++ b/cspi/spi_image.c
@@ -1,8 +1,5 @@
-#include "spi-util.h"
-
-
 int
-AccessibleImage_ref (AccessibleImage *obj)
+SpiAccessibleImage_ref (SpiAccessibleImage *obj)
 {
   Accessibility_Image_ref (*obj, &ev);
   return 0;
@@ -11,7 +8,7 @@ AccessibleImage_ref (AccessibleImage *obj)
 
 
 int
-AccessibleImage_unref (AccessibleImage *obj)
+SpiAccessibleImage_unref (SpiAccessibleImage *obj)
 {
   Accessibility_Image_unref (*obj, &ev);
   return 0;
@@ -20,16 +17,16 @@ AccessibleImage_unref (AccessibleImage *obj)
 
 
 char *
-AccessibleImage_getImageDescription (AccessibleImage *obj)
+SpiAccessibleImage_getImageDescription (SpiAccessibleImage *obj)
 {
-  return string_from_corba_string (
-                                  Accessibility_Image__get_imageDescription (*obj, &ev));
-}
+  return (char *)
+    Accessibility_Image__get_imageDescription (*obj, &ev);
+    }
 
 
 
 void
-AccessibleImage_getImageSize (AccessibleImage *obj,
+SpiAccessibleImage_getImageSize (SpiAccessibleImage *obj,
                               long *width,
                               long *height)
 {
@@ -40,10 +37,10 @@ AccessibleImage_getImageSize (AccessibleImage *obj,
 
 
 void
-AccessibleImage_getImagePosition (AccessibleImage *obj,
+SpiAccessibleImage_getImagePosition (SpiAccessibleImage *obj,
                                   long *x,
                                   long *y,
-                                  AccessibleCoordType ctype)
+                                  SpiAccessibleCoordType ctype)
 {
   Accessibility_Image_getImagePosition (*obj,
                                        (CORBA_long *) x, (CORBA_long *) y, (CORBA_short) ctype,