Renamed SpiAccessibleEventListener to (just) SpiEventListener.

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

diff --git a/cspi/spi_table.c b/cspi/spi_table.c
index f85ba21..91d9f76 100644 (file)
--- a/cspi/spi_table.c
+++ b/cspi/spi_table.c
@@ -1,5 +1,3 @@
-#include "spi-util.h"
-
 int
 AccessibleTable_ref (AccessibleTable *obj)
 {
@@ -102,9 +100,9 @@ char *
 AccessibleTable_getRowDescription (AccessibleTable *obj,
                                   long row)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getRowDescription (*obj,
-                                                                         (CORBA_long) row, &ev));
+  return (char *)
+    Accessibility_Table_getRowDescription (*obj,
+                                          (CORBA_long) row, &ev);
 }
 
 
@@ -113,9 +111,9 @@ char *
 AccessibleTable_getColumnDescription (AccessibleTable *obj,
                                      long column)
 {
-  return string_from_corba_string (
-                                  Accessibility_Table_getColumnDescription (*obj,
-                                                                            (CORBA_long) column, &ev));
+  return (char *)
+    Accessibility_Table_getColumnDescription (*obj,
+                                             (CORBA_long) column, &ev);
 }
 
 
@@ -186,7 +184,7 @@ AccessibleTable_getSelectedRows (AccessibleTable *obj,
 
   i = rows->_buffer;
   length = (long) rows->_length;
-  j = *selectedRows = malloc (sizeof(long)*length);
+  j = *selectedRows = (long *) malloc (sizeof(long)*length);
   
   while (length--)
     *j++ = (CORBA_long) (*i++);
@@ -217,7 +215,7 @@ AccessibleTable_getSelectedColumns (AccessibleTable *obj,
 
   i = columns->_buffer;
   length = (long) columns->_length;
-  j = *selectedColumns = malloc (sizeof(long)*length);
+  j = *selectedColumns = (long *) malloc (sizeof(long)*length);
   
   while (length--)
     *j++ = (CORBA_long) (*i++);