2009-05-11 Mike Gorse <mgorse@novell.com>

Fix xml definition of getRunAttributes.
Update cspi text bindings to expect the return value first.

diff --git a/cspi/spi-text.c b/cspi/spi-text.c
index 5339a39..6c5786d 100644 (file)
--- a/cspi/spi-text.c
+++ b/cspi/spi-text.c
@@ -252,7 +252,7 @@ AccessibleText_getAttributes (AccessibleText *obj,
       return NULL;
     }
 
-  cspi_dbus_call (obj, spi_interface_text, "getAttributes", NULL, "i=>iis", d_offset, &retStartOffset, &retEndOffset, &retval);
+  cspi_dbus_call (obj, spi_interface_text, "getAttributes", NULL, "i=>sii", d_offset, &retval, &retStartOffset, &retEndOffset);
 
   if (!cspi_check_ev ("getAttributes"))
     {
@@ -372,7 +372,7 @@ AccessibleText_getTextBeforeOffset (AccessibleText *obj,
       return NULL;
     }
 
-  cspi_dbus_call (obj, spi_interface_text, "getTextBeforeOffset", NULL, "iu=>iis", d_offset, d_type, &retStartOffset, &retEndOffset, &retval);
+  cspi_dbus_call (obj, spi_interface_text, "getTextBeforeOffset", NULL, "iu=>sii", d_offset, d_type, &retval, &retStartOffset, &retEndOffset);
   if (!cspi_check_ev ("getTextBeforeOffset"))
     {
       *startOffset = *endOffset = -1;
@@ -424,7 +424,7 @@ AccessibleText_getTextAtOffset (AccessibleText *obj,
       return NULL;
     }
 
-  cspi_dbus_call (obj, spi_interface_text, "getTextAtOffset", NULL, "iu=>iis", d_offset, d_type, &retStartOffset, &retEndOffset, &retval);
+  cspi_dbus_call (obj, spi_interface_text, "getTextAtOffset", NULL, "iu=>sii", d_offset, d_type, &retval, &retStartOffset, &retEndOffset);
 
   if (!cspi_check_ev ("getTextAtOffset"))
     {
@@ -477,7 +477,7 @@ AccessibleText_getTextAfterOffset (AccessibleText *obj,
       return NULL;
     }
 
-  cspi_dbus_call (obj, spi_interface_text, "getTextAfterOffset", NULL, "iu=>iis", d_offset, d_type, &retStartOffset, &retEndOffset, &retval);
+  cspi_dbus_call (obj, spi_interface_text, "getTextAfterOffset", NULL, "iu=>sii", d_offset, d_type, &retval, &retStartOffset, &retEndOffset);
 
   if (!cspi_check_ev ("getTextAfterOffset"))
     {
@@ -916,7 +916,7 @@ AccessibleText_getAttributeRun (AccessibleText *obj,
        return NULL;
   }
 
-  cspi_dbus_call (obj, spi_interface_text, "getAttributeRun", NULL, "ib=>iias", d_offset, d_includeDefaults, &retStartOffset, &retEndOffset, &attributes);
+  cspi_dbus_call (obj, spi_interface_text, "getAttributeRun", NULL, "ib=>asii", d_offset, d_includeDefaults, &attributes, &retStartOffset, &retEndOffset);
 
   if (!cspi_check_ev ("getAttributeRun"))
     {

diff --git a/xml/org.freedesktop.atspi.Text.xml b/xml/org.freedesktop.atspi.Text.xml
index 6d17692..54d984f 100644 (file)
--- a/xml/org.freedesktop.atspi.Text.xml
+++ b/xml/org.freedesktop.atspi.Text.xml
@@ -654,6 +654,18 @@
         The offset of the character whose attributes will be reported.
            </tp:docstring>
     </arg>
+    <arg direction="in" name="includeDefaults" type="b" tp:type="boolean">
+           <tp:docstring>
+        If False, the call should only return those attributes which are
+        explicitly set on the current attribute run, omitting any attributes which are inherited from 
+        the default values. See also Text.getDefaultAttributes. 
+           </tp:docstring>
+    </arg>
+    <arg direction="out" type="{ss}" tp:type="AttributeSet">
+    <tp:docstring>
+      The AttributeSet defined at offset, optionally including the 'default' attributes.
+    </tp:docstring>
+    </arg>
     <arg direction="out" name="startOffset" type="i">
            <tp:docstring>
         Backfilled with the starting offset of the character range over which all
@@ -668,18 +680,6 @@
         the homogeneous attribute run including <code>offset</code>.
            </tp:docstring>
     </arg>
-    <arg direction="in" name="includeDefaults" type="b" tp:type="boolean">
-           <tp:docstring>
-        If False, the call should only return those attributes which are
-        explicitly set on the current attribute run, omitting any attributes which are inherited from 
-        the default values. See also Text.getDefaultAttributes. 
-           </tp:docstring>
-    </arg>
-    <arg direction="out" type="{ss}" tp:type="AttributeSet">
-    <tp:docstring>
-      The AttributeSet defined at offset, optionally including the 'default' attributes.
-    </tp:docstring>
-    </arg>
   </method>
   <method name="getDefaultAttributeSet">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">