lib: fix GObject introspection closure annotation warnings

Move closure annotations from data parameters to function parameters and
also add destroy annotations where necessary. This fixes the "invalid
closure annotation" warnings during the build.

lib/wp/component-loader.c

@@ -153,8 +153,8 @@ on_component_loader_load_done (WpComponentLoader * cl, GAsyncResult * res,
  *   provide if it loads successfully; this can be queried later with
  *   wp_core_test_feature()
  * \param cancellable (nullable): optional GCancellable
- * \param callback (scope async): the callback to call when the operation is done
- * \param data (closure): data to pass to \a callback
+ * \param callback (scope async)(closure data): the callback to call when the operation is done
+ * \param data data to pass to \a callback
  */
 void
 wp_core_load_component (WpCore * self, const gchar * component,

lib/wp/core.c

@@ -1138,8 +1138,8 @@ wp_core_update_properties (WpCore * self, WpProperties * updates)
  * \ingroup wpcore
  * \param self the core
  * \param source (out) (optional): the source
- * \param function (scope notified): the function to call
- * \param data (closure): data to pass to \a function
+ * \param function (scope notified)(closure data)(destroy destroy): the function to call
+ * \param data data to pass to \a function
  * \param destroy (nullable): a function to destroy \a data
  */
 void
@@ -1203,8 +1203,8 @@ wp_core_idle_add_closure (WpCore * self, GSource **source, GClosure * closure)
  * \param self the core
  * \param source (out) (optional): the source
  * \param timeout_ms the timeout in milliseconds
- * \param function (scope notified): the function to call
- * \param data (closure): data to pass to \a function
+ * \param function (scope notified)(closure data)(destroy destroy): the function to call
+ * \param data data to pass to \a function
  * \param destroy (nullable): a function to destroy \a data
  */
 void
@@ -1267,8 +1267,8 @@ wp_core_timeout_add_closure (WpCore * self, GSource **source, guint timeout_ms,
  * \ingroup wpcore
  * \param self the core
  * \param cancellable (nullable): a GCancellable to cancel the operation
- * \param callback (scope async): a function to call when the operation is done
- * \param user_data (closure): data to pass to \a callback
+ * \param callback (scope async)(closure user_data): a function to call when the operation is done
+ * \param user_data data to pass to \a callback
  * \returns TRUE if the sync operation was started, FALSE if an error
  *   occurred before returning from this function
  */

lib/wp/event-hook.c

@@ -239,9 +239,9 @@ wp_event_hook_runs_for_event (WpEventHook * self, WpEvent * event)
  * \param self the event hook
  * \param event the event that triggered the hook
  * \param cancellable (nullable): a GCancellable to cancel the async operation
- * \param callback (scope async): a callback to fire after execution of the hook
+ * \param callback (scope async)(closure callback_data): a callback to fire after execution of the hook
  *    has completed
- * \param callback_data (closure): data for the callback
+ * \param callback_data data for the callback
  */
 void
 wp_event_hook_run (WpEventHook * self,

lib/wp/iterator.c

@@ -178,9 +178,9 @@ wp_iterator_next (WpIterator *self, GValue *item)
  *
  * \ingroup wpiterator
  * \param self the iterator
- * \param func (scope call): the fold function
+ * \param func (scope call)(closure data): the fold function
  * \param ret (inout): the accumulator data
- * \param data (closure): the user data
+ * \param data the user data
  * \returns TRUE if all the items were processed, FALSE otherwise.
  */
 gboolean
@@ -200,8 +200,8 @@ wp_iterator_fold (WpIterator *self, WpIteratorFoldFunc func, GValue *ret,
  *
  * \ingroup wpiterator
  * \param self the iterator
- * \param func (scope call): the foreach function
- * \param data (closure): the user data
+ * \param func (scope call)(closure data): the foreach function
+ * \param data the user data
  * \returns TRUE if all the items were processed, FALSE otherwise.
  */
 gboolean

lib/wp/json-utils.c

@@ -72,8 +72,8 @@ match_rules_cb (void *data, const char *location, const char *action,
  * \ingroup wpjsonutils
  * \param json a JSON array containing rules in the described format
  * \param match_props (transfer none): the properties to match against the rules
- * \param callback (scope call): a function to call for each action on a successful match
- * \param data (closure callback): data to be passed to \a callback
+ * \param callback (scope call)(closure data): a function to call for each action on a successful match
+ * \param data data to be passed to \a callback
  * \param error (out)(optional): the error that occurred, if any
  * \returns FALSE if an error occurred, TRUE otherwise
  */

lib/wp/object.c

@@ -441,8 +441,8 @@ on_transition_completed (WpTransition * transition, GParamSpec * param,
  * \param self the object
  * \param features the features to enable
  * \param cancellable (nullable): a cancellable for the async operation
- * \param callback (scope async): a function to call when activation is complete
- * \param user_data (closure): data for \a callback
+ * \param callback (scope async)(closure user_data): a function to call when activation is complete
+ * \param user_data data for \a callback
  */
 void
 wp_object_activate (WpObject * self,

lib/wp/proxy-interfaces.c

@@ -213,8 +213,8 @@ wp_pipewire_object_get_param_info (WpPipewireObject * self)
  * \param id (nullable): the parameter id to enumerate or NULL for all parameters
  * \param filter (nullable): a param filter or NULL
  * \param cancellable (nullable): a cancellable for the async operation
- * \param callback (scope async): a callback to call with the result
- * \param user_data (closure): data to pass to \a callback
+ * \param callback (scope async)(closure user_data): a callback to call with the result
+ * \param user_data data to pass to \a callback
  */
 void
 wp_pipewire_object_enum_params (WpPipewireObject * self, const gchar * id,

lib/wp/si-interfaces.c

@@ -94,8 +94,8 @@ wp_si_adapter_get_ports_format (WpSiAdapter * self, const gchar **mode)
  * \param self the session item
  * \param format (transfer full) (nullable): the format to be set
  * \param mode (nullable): the mode
- * \param callback (scope async): the callback to call when the operation is done
- * \param data (closure): user data for \a callback
+ * \param callback (scope async)(closure data): the callback to call when the operation is done
+ * \param data user data for \a callback
  */
 void
 wp_si_adapter_set_ports_format (WpSiAdapter * self, WpSpaPod *format,
@@ -358,8 +358,8 @@ wp_si_acquisition_default_init (WpSiAcquisitionInterface * iface)
  * \param self the session item
  * \param acquisitor the link that is trying to acquire a port info item
  * \param item the item that is being acquired
- * \param callback (scope async): the callback to call when the operation is done
- * \param data (closure): user data for \a callback
+ * \param callback (scope async)(closure data): the callback to call when the operation is done
+ * \param data user data for \a callback
  */
 void
 wp_si_acquisition_acquire (WpSiAcquisition * self, WpSiLink * acquisitor,

lib/wp/transition.c

@@ -170,8 +170,8 @@ wp_transition_async_result_init (GAsyncResultIface * iface)
  * \param source_object (nullable) (type GObject): the GObject that owns this
  *   task, or NULL
  * \param cancellable (nullable): optional GCancellable
- * \param callback (scope async): a GAsyncReadyCallback
- * \param callback_data (closure): user data passed to \a callback
+ * \param callback (scope async)(closure callback_data): a GAsyncReadyCallback
+ * \param callback_data user data passed to \a callback
  * \returns (transfer none): the new transition
  */
 WpTransition *