Fix meson build error

[platform/upstream/at-spi2-core.git] / atspi / atspi-collection.c

diff --git a/atspi/atspi-collection.c b/atspi/atspi-collection.c
index 138d658..97c4e05 100644 (file)
--- a/atspi/atspi-collection.c
+++ b/atspi/atspi-collection.c
@@ -36,7 +36,7 @@ atspi_collection_is_ancestor_of (AtspiCollection *collection,
                                  AtspiAccessible *test,
                                  GError **error)
 {
-  g_warning ("Atspi: TODO: Implement is_ancestor_of");
+  g_warning ("AT-SPI: TODO: Implement is_ancestor_of");
   return FALSE;
 }
 
@@ -81,10 +81,12 @@ static GArray *
 return_accessibles (DBusMessage *message)
 {
   DBusMessageIter iter, iter_array;
-  GArray *ret = g_array_new (TRUE, TRUE, sizeof (AtspiAccessible *));
+  GArray *ret;
 
   _ATSPI_DBUS_CHECK_SIG (message, "a(so)", NULL, NULL);
 
+  ret = g_array_new (TRUE, TRUE, sizeof (AtspiAccessible *));
+
   dbus_message_iter_init (message, &iter);
   dbus_message_iter_recurse (&iter, &iter_array);
 
@@ -101,16 +103,11 @@ return_accessibles (DBusMessage *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
@@ -150,25 +147,18 @@ atspi_collection_get_matches (AtspiCollection *collection,
 
 /**
  * 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.
- *
+ *          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.
- *
+ *          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 
@@ -218,21 +208,14 @@ atspi_collection_get_matches_to (AtspiCollection *collection,
 
 /**
  * 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  
@@ -280,12 +263,13 @@ atspi_collection_get_matches_from (AtspiCollection *collection,
 /**
  * atspi_collection_get_active_descendant:
  *
+* Returns: (transfer full): The active descendant of the given object.
  * Not yet implemented.
  **/
 AtspiAccessible *
 atspi_collection_get_active_descendant (AtspiCollection *collection, GError **error)
 {
-  g_warning ("atspi: TODO: Implement get_active_descendants");
+  g_warning ("AT-SPI: TODO: Implement get_active_descendants");
   return NULL;
 }