"Unfixed" some things :-). cleaned up and made some of the namespace changes more...

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

diff --git a/cspi/spi_text.c b/cspi/spi_text.c
index 28bd5bd..8d15f57 100644 (file)
--- a/cspi/spi_text.c
+++ b/cspi/spi_text.c
@@ -19,8 +19,15 @@ AccessibleText_unref (AccessibleText *obj)
 long
 AccessibleText_getCharacterCount (AccessibleText *obj)
 {
-  return (long)
+  long retval;
+
+  CORBA_exception_init (&ev);
+  retval = (long)
     Accessibility_Text__get_characterCount (*obj, &ev);
+
+  spi_check_ev (&ev, "SpiAccessibleText_getCharacterCount");
+
+  return retval;
 }
 
 
@@ -49,9 +56,9 @@ AccessibleText_getCaretOffset (AccessibleText *obj)
 
 char *
 AccessibleText_getAttributes (AccessibleText *obj,
-                                long offset,
-                                long *startOffset,
-                                long *endOffset)
+                             long offset,
+                             long *startOffset,
+                             long *endOffset)
 {
   CORBA_long retStartOffset, retEndOffset;
   char *retval;        
@@ -82,7 +89,7 @@ AccessibleText_setCaretOffset (AccessibleText *obj,
 char *
 AccessibleText_getTextBeforeOffset (AccessibleText *obj,
                                     long offset,
-                                    TEXT_BOUNDARY_TYPE type,
+                                    AccessibleTextBoundaryType type,
                                    long *startOffset, long *endOffset)
 {
   char *retval;
@@ -101,9 +108,9 @@ AccessibleText_getTextBeforeOffset (AccessibleText *obj,
 
 char *
 AccessibleText_getTextAtOffset (AccessibleText *obj,
-                                    long offset,
-                                    TEXT_BOUNDARY_TYPE type,
-                                   long *startOffset, long *endOffset)
+                               long offset,
+                               AccessibleTextBoundaryType type,
+                               long *startOffset, long *endOffset)
 {
   CORBA_long corbaStartOffset;
   CORBA_long corbaEndOffset;
@@ -126,9 +133,9 @@ AccessibleText_getTextAtOffset (AccessibleText *obj,
 
 char *
 AccessibleText_getTextAfterOffset (AccessibleText *obj,
-                                    long offset,
-                                    TEXT_BOUNDARY_TYPE type,
-                                   long *startOffset, long *endOffset)
+                                  long offset,
+                                  AccessibleTextBoundaryType type,
+                                  long *startOffset, long *endOffset)
 {
   char *retval;
   CORBA_long retStartOffset, retEndOffset;
@@ -192,7 +199,6 @@ AccessibleText_getOffsetAtPoint (AccessibleText *obj,
 }
 
 
-
 long
 AccessibleText_getNSelections (AccessibleText *obj)
 {
@@ -229,7 +235,6 @@ AccessibleText_addSelection (AccessibleText *obj,
 }
 
 
-
 boolean
 AccessibleText_removeSelection (AccessibleText *obj,
                                long selectionNum)