Avoid reentering spi_dbus_update_cache

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

diff --git a/cspi/spi_editabletext.c b/cspi/spi_editabletext.c
index a4d857f..31ae429 100644 (file)
--- a/cspi/spi_editabletext.c
+++ b/cspi/spi_editabletext.c
@@ -2,7 +2,8 @@
  * AT-SPI - Assistive Technology Service Provider Interface
  * (Gnome Accessibility Project; http://developer.gnome.org/projects/gap)
  *
- * Copyright 2001 Sun Microsystems Inc.
+ * Copyright 2001, 2002 Sun Microsystems Inc.,
+ * Copyright 2001, 2002 Ximian, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -69,15 +70,12 @@ AccessibleEditableText_setAttributes (AccessibleEditableText *obj,
                                      long int startPos,
                                      long int endPos)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_startPos = startPos, d_endPos = endPos;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = 
-    Accessibility_EditableText_setAttributes (CSPI_OBJREF (obj),
-                                             (CORBA_char *) attributes,
-                                             (CORBA_long) startPos,
-                                             (CORBA_long) endPos, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "setAttributes", NULL, "sii=>b", attributes, d_startPos, d_endPos, &retval);
 
   cspi_return_val_if_ev ("setAttributes", FALSE);
 
@@ -98,12 +96,11 @@ SPIBoolean
 AccessibleEditableText_setTextContents (AccessibleEditableText *obj,
                                         const char *newContents)
 {
-  SPIBoolean retval;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_EditableText_setTextContents (CSPI_OBJREF (obj),
-                                      (CORBA_char *) newContents, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "setTextContents", NULL, "s=>b", newContents, &retval);
 
   cspi_return_val_if_ev ("setTextContents", FALSE);
 
@@ -131,13 +128,12 @@ AccessibleEditableText_insertText (AccessibleEditableText *obj,
                                    const char *text,
                                    long int length)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_position = position, d_length = length;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_EditableText_insertText (CSPI_OBJREF (obj),
-                                        (CORBA_long) position, (const CORBA_char *) text,
-                                        (CORBA_long) length, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "insertText", NULL, "isi=>b", d_position, text, d_length, &retval);
 
   cspi_return_val_if_ev ("insertText", FALSE);
 
@@ -163,11 +159,11 @@ AccessibleEditableText_copyText (AccessibleText *obj,
                                  long int startPos,
                                  long int endPos)
 {
+  dbus_int32_t d_startPos = startPos, d_endPos = endPos;
+
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  Accessibility_EditableText_copyText (
-    CSPI_OBJREF (obj), (CORBA_long) startPos,
-    (CORBA_long) endPos, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "copyText", NULL, "ii", startPos, endPos);
 
   cspi_return_val_if_ev ("copyText", FALSE);
 
@@ -194,13 +190,12 @@ AccessibleEditableText_cutText (AccessibleEditableText *obj,
                                 long int startPos,
                                 long int endPos)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_startPos = startPos, d_endPos = endPos;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_EditableText_cutText (
-    CSPI_OBJREF (obj),
-    (CORBA_long) startPos, (CORBA_long) endPos, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "cutText", NULL, "ii=>b", d_startPos, d_endPos, &retval);
 
   cspi_return_val_if_ev ("cutText", FALSE);
 
@@ -227,13 +222,12 @@ AccessibleEditableText_deleteText (AccessibleEditableText *obj,
                                    long startPos,
                                    long endPos)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_startPos = startPos, d_endPos = endPos;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_EditableText_deleteText (
-    CSPI_OBJREF (obj),
-    (CORBA_long) startPos, (CORBA_long) endPos, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "deleteText", NULL, "ii=>b", d_startPos, d_endPos, &retval);
 
   cspi_return_val_if_ev ("deleteText", FALSE);
 
@@ -257,12 +251,12 @@ SPIBoolean
 AccessibleEditableText_pasteText (AccessibleEditableText *obj,
                                   long int position)
 {
-  SPIBoolean retval;
+  dbus_int32_t d_position = position;
+  dbus_bool_t retval;
 
   cspi_return_val_if_fail (obj != NULL, FALSE);
 
-  retval = Accessibility_EditableText_pasteText (
-    CSPI_OBJREF (obj), (CORBA_long) position, cspi_ev ());
+  cspi_dbus_call (obj, spi_interface_editable_text, "pasteText", NULL, "i=>b", d_position, &retval);
 
   cspi_return_val_if_ev ("pasteText", FALSE);