Re: [libvirt] [libvirt-glib] gir: fix introspection of asyncs and array delegate

--- libvirt-gobject/libvirt-gobject-connection.c | 24 ++++++++++++------------ libvirt-gobject/libvirt-gobject-connection.h | 6 +++--- libvirt-gobject/libvirt-gobject-storage-pool.c | 8 ++++---- libvirt-gobject/libvirt-gobject-storage-pool.h | 2 +- libvirt-gobject/libvirt-gobject-stream.h | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 90d1566..5fc0a9e 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -431,19 +431,19 @@ gvir_connection_open_helper(GSimpleAsyncResult *res, * gvir_connection_open_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_open_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_open); g_simple_async_result_run_in_thread(res, gvir_connection_open_helper, @@ -828,19 +828,19 @@ gvir_connection_fetch_domains_helper(GSimpleAsyncResult *res, * gvir_connection_fetch_domains_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_fetch_domains_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_fetch_domains); g_simple_async_result_run_in_thread(res, gvir_connection_fetch_domains_helper, @@ -889,19 +889,19 @@ gvir_connection_fetch_pools_helper(GSimpleAsyncResult *res, * gvir_connection_fetch_storage_pools_async: * @conn: the connection * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(conn), callback, - opaque, + user_data, gvir_connection_fetch_storage_pools); g_simple_async_result_run_in_thread(res, gvir_connection_fetch_pools_helper, diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index d05f792..2eb58ec 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -77,7 +77,7 @@ gboolean gvir_connection_open(GVirConnection *conn, void gvir_connection_open_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_open_finish(GVirConnection *conn, GAsyncResult *result, GError **err); @@ -90,7 +90,7 @@ gboolean gvir_connection_fetch_domains(GVirConnection *conn, void gvir_connection_fetch_domains_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, GAsyncResult *result, GError **err); @@ -149,7 +149,7 @@ gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, GAsyncResult *result, GError **err); diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index 8f581eb..fc9cba9 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -385,19 +385,19 @@ gvir_storage_pool_refresh_helper(GSimpleAsyncResult *res, * gvir_storage_pool_refresh_async: * @pool: the storage pool * @cancellable: (allow-none)(transfer none): cancellation object - * @callback: (transfer none): completion callback - * @opaque: (transfer none)(allow-none): opaque data for callback + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback */ void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque) + gpointer user_data) { GSimpleAsyncResult *res; res = g_simple_async_result_new(G_OBJECT(pool), callback, - opaque, + user_data, gvir_storage_pool_refresh); g_simple_async_result_run_in_thread(res, gvir_storage_pool_refresh_helper, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index a789a6a..620f888 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -75,7 +75,7 @@ gboolean gvir_storage_pool_refresh(GVirStoragePool *pool, void gvir_storage_pool_refresh_async(GVirStoragePool *pool, GCancellable *cancellable, GAsyncReadyCallback callback, - gpointer opaque); + gpointer user_data); gboolean gvir_storage_pool_refresh_finish(GVirStoragePool *pool, GAsyncResult *result, GError **err); diff --git a/libvirt-gobject/libvirt-gobject-stream.h b/libvirt-gobject/libvirt-gobject-stream.h index fd9c9bb..5181e24 100644 --- a/libvirt-gobject/libvirt-gobject-stream.h +++ b/libvirt-gobject/libvirt-gobject-stream.h @@ -62,7 +62,7 @@ struct _GVirStreamClass /** * GVirStreamSinkFunc: * @stream: a #GVirStream - * @buf: data pointer + * @buf: (out) (array length=nbytes) (transfer none): data pointer * @nbytes: data size * @user_data: user data passed to the function * Returns: the number of bytes filled, 0 upon end