return NULL;
accessible = ATSPI_ACCESSIBLE (collection);
+ if (!accessible->parent.app)
+ return NULL;
return dbus_message_new_method_call (accessible->parent.app->bus_name,
accessible->parent.path,
atspi_interface_collection,
while (dbus_message_iter_get_arg_type (&iter_array) != DBUS_TYPE_INVALID)
{
AtspiAccessible *accessible;
- GArray *new_array;
accessible = _atspi_dbus_return_accessible_from_iter (&iter_array);
- new_array = g_array_append_val (ret, accessible);
- if (new_array)
- ret = new_array;
+ ret = g_array_append_val (ret, accessible);
/* Iter was moved already, so no need to call dbus_message_iter_next */
}
dbus_message_unref (message);
/**
* atspi_collection_get_matches:
- *
* @collection: A pointer to the #AtspiCollection to query.
- *
* @rule: An #AtspiMatchRule describing the match criteria.
- *
* @sortby: An #AtspiCollectionSortOrder specifying the way the results are to
* be sorted.
- *
* @count: The maximum number of results to return, or 0 for no limit.
- *
* @traverse: Not supported.
*
* Gets all #AtspiAccessible objects from the @collection matching a given
/**
* atspi_collection_get_matches_to:
- *
* @collection: A pointer to the #AtspiCollection to query.
- *
* @current_object: The object at which to start searching.
- *
* @rule: An #AtspiMatchRule describing the match criteria.
- *
* @sortby: An #AtspiCollectionSortOrder specifying the way the results are to
* be sorted.
- *
* @tree: An #AtspiCollectionTreeTraversalType specifying restrictions on
- * the objects to be traversed.
- *
- * @restrict: If #TRUE, only descendants of @current_object's parent
- * will be returned. Otherwise (if #FALSE), any accessible may be returned
- * if it would preceed @current_object in a flattened hierarchy.
- *
+ * the objects to be traversed.
+ * @limit_scope: If #TRUE, only descendants of @current_object's parent
+ * will be returned. Otherwise (if #FALSE), any accessible may be
+ * returned if it would preceed @current_object in a flattened
+ * hierarchy.
* @count: The maximum number of results to return, or 0 for no limit.
- *
* @traverse: Not supported.
*
* Gets all #AtspiAccessible objects from the @collection, after
AtspiMatchRule *rule,
AtspiCollectionSortOrder sortby,
AtspiCollectionTreeTraversalType tree,
- gboolean restrict,
+ gboolean limit_scope,
gint count,
gboolean traverse,
GError **error)
DBusMessage *reply;
dbus_int32_t d_sortby = sortby;
dbus_int32_t d_tree = tree;
- dbus_bool_t d_restrict = restrict;
+ dbus_bool_t d_limit_scope = limit_scope;
dbus_int32_t d_count = count;
dbus_bool_t d_traverse = traverse;
return NULL;
dbus_message_append_args (message, DBUS_TYPE_UINT32, &d_sortby,
DBUS_TYPE_UINT32, &d_tree,
- DBUS_TYPE_BOOLEAN, &d_restrict,
+ DBUS_TYPE_BOOLEAN, &d_limit_scope,
DBUS_TYPE_INT32, &d_count,
DBUS_TYPE_BOOLEAN, &d_traverse,
DBUS_TYPE_INVALID);
/**
* atspi_collection_get_matches_from:
- *
* @collection: A pointer to the #AtspiCollection to query.
- *
* @current_object: Upon reaching this object, searching should stop.
- *
* @rule: An #AtspiMatchRule describing the match criteria.
- *
* @sortby: An #AtspiCollectionSortOrder specifying the way the results are to
* be sorted.
- *
* @tree: An #AtspiCollectionTreeTraversalType specifying restrictions on
- * the objects to be traversed.
- *
+ * the objects to be traversed.
* @count: The maximum number of results to return, or 0 for no limit.
- *
* @traverse: Not supported.
*
* Gets all #AtspiAccessible objects from the @collection, before
/**
* atspi_collection_get_active_descendant:
*
+* Returns: (transfer full): The active descendant of the given object.
* Not yet implemented.
**/
AtspiAccessible *