Update spec to reflect what has been implemented

Remove some unused code

diff --git a/libspi/accessible.c b/libspi/accessible.c
index df1801216e2f4f7b401a04b93e8b6dd3aa60a33f..5828a8b93b3480292ca672a6920a0861c27d0da2 100644 (file)
--- a/libspi/accessible.c
+++ b/libspi/accessible.c
@@ -125,36 +125,6 @@ impl_get_childCount_str (void *datum)
   return g_strdup_printf ("%d", count);
 }
 
-#if 0
-static DBusMessage *
-impl_isEqual (DBusConnection * bus, DBusMessage * message, void *user_data)
-{
-}
-#endif
-
-#if 0
-static DBusMessage *
-impl_getChildAtIndex (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
-{
-  AtkObject *object = get_object (message);
-  dbus_int32_t index;
-  DBusError error;
-  AtkObject *child;
-
-  if (!object)
-    return spi_dbus_general_error (message);
-  dbus_error_init (&error);
-  if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID))
-    {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
-    }
-  child = atk_object_ref_accessible - child (object, index);
-  return spi_dbus_return_object (message, child, TRUE);
-}
-#endif
-
 static DBusMessage *
 impl_getChildren (DBusConnection * bus, DBusMessage * message,
                  void *user_data)
@@ -643,12 +613,11 @@ impl_getApplication (DBusConnection * bus, DBusMessage * message,
   return spi_dbus_return_object (message, root, FALSE);
 }
 
-// TODO: sync spec with updates made here
 static DRouteMethod methods[] = {
   //{ DROUTE_METHOD, impl_isEqual, "isEqual", "o,obj,i:b,,o" },
   {DROUTE_METHOD, impl_getChildren, "getChildren", "ao,,o"},
   {DROUTE_METHOD, impl_getIndexInParent, "getIndexInParent", "i,,o"},
-  //{ DROUTE_METHOD, impl_getRelationSet, "getRelationSet", "a{so},,o" },
+  //{ DROUTE_METHOD, impl_getRelationSet, "getRelationSet", "a{uao},,o" },
   {DROUTE_METHOD, impl_getRole, "getRole", "u,,o"},
   {DROUTE_METHOD, impl_getRoleName, "getRoleName", "s,,o"},
   {DROUTE_METHOD, impl_getLocalizedRoleName, "getLocalizedRoleName", "s,,o"},

diff --git a/xml/Accessibility_Accessible.xml b/xml/Accessibility_Accessible.xml
index 8c2894c2c5fb69db8c8f4d0a4c84b56d6ccffa3c..37f7fa79c1d7fb5eddcb029ae3aa5859630afee2 100644 (file)
--- a/xml/Accessibility_Accessible.xml
+++ b/xml/Accessibility_Accessible.xml
@@ -109,36 +109,13 @@
     childCount: the number of children contained by this object.
   </tp:docstring>
   </tp:property>
-  <method name="isEqual">
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>Determine whether an ::Accessible refers to the same object as another.
-        This method should be used rather than brute-force comparison of
-        object references (i.e. &quot;by-value&quot; comparison), as two object references
-        may have different apparent values yet refer to the same object.    </p>
-    </tp:docstring>
-    <arg direction="in" name="obj" type="o" tp:type="Accessible">
-    <tp:docstring>
-      an ::Accessible object reference to compare to
-    </tp:docstring>
-    </arg>
-    <arg direction="out" type="b" tp:type="boolean">
-    <tp:docstring>
-      a \c boolean indicating whether the two object referencespoint to the same object. 
-    </tp:docstring>
-    </arg>
-  </method>
-  <method name="getChildAtIndex">
+  <method name="getChildren">
     <tp:docstring>
-      Get the accessible child of this object at \c index.
+      Get the accessible children of this object.
     </tp:docstring>
-    <arg direction="in" name="index" type="i">
-    <tp:docstring>
-      an in parameter indicating which child is requested (zero-indexed).
-    </tp:docstring>
-    </arg>
-    <arg direction="out" type="o" tp:type="Accessible">
+    <arg direction="out" type="ao" tp:type="AccessibleSet">
     <tp:docstring>
-      the 'nth' ::Accessible child of this object.
+      the ::Accessible children of this object.
     </tp:docstring>
     </arg>
   </method>
@@ -152,16 +129,18 @@
     </tp:docstring>
     </arg>
   </method>
+  <!-- TODO: Decide whether to implement this, or put these in the tree
   <method name="getRelationSet">
     <tp:docstring>
       Get a set defining this object's relationship to other accessible objects.
     </tp:docstring>
-    <arg direction="out" type="au" tp:type="RelationSet">
+    <arg direction="out" type="a{uao}" tp:type="RelationSet">
     <tp:docstring>
       a ::RelationSet defining this object's relationships.
     </tp:docstring>
     </arg>
   </method>
+  -->
   <method name="getRole">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Get the ::Role indicating the type of UI role played by this object.    </p>
@@ -197,9 +176,10 @@
     <tp:docstring>
       Get the current state of the object as a ::StateSet.
     </tp:docstring>
-    <arg direction="out" type="o" tp:type="StateSet">
+    <arg direction="out" type="au" tp:type="StateSet">
     <tp:docstring>
       a ::StateSet encapsulating the currently true states of the object.
+      Returns an array of (currently two) 32-bit integers giving bitwise flags.
     </tp:docstring>
     </arg>
   </method>