From b9c70ec0c55d51d6e7b20324adc8efbc635a2cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 8 Nov 2018 18:50:49 +0100 Subject: [PATCH] libnm: fix GObject Introspection annotations for functions returning a GPtrArray The GPtrArray owns the element so it is a (transfer full). https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/46 (cherry picked from commit 201c153e25990f61421be9984ecca5bc71be5845) (cherry picked from commit 7d5cce2e10503afa6f1f6dff1e89204a3ef6e78b) (cherry picked from commit 000c805921993f251117ff698070fcde85a9459e) --- libnm/nm-access-point.c | 2 +- libnm/nm-device.c | 2 +- libnm/nm-wimax-nsp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index ed0135ba88..1cb8247598 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -367,7 +367,7 @@ nm_access_point_connection_valid (NMAccessPoint *ap, NMConnection *connection) * #NMDevice using nm_device_filter_connections() and finally filter that list * with this function. * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @ap. The array should * be freed with g_ptr_array_unref() when it is no longer required. **/ diff --git a/libnm/nm-device.c b/libnm/nm-device.c index bdf6301539..e16afa3f6c 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2525,7 +2525,7 @@ nm_device_connection_compatible (NMDevice *device, NMConnection *connection, GEr * incompatible with the device. To get the full list of connections see * nm_client_get_connections(). * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @device. The array * should be freed with g_ptr_array_unref() when it is no longer required. **/ diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index f8c8ca42b6..90c2c2bba0 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -151,7 +151,7 @@ nm_wimax_nsp_connection_valid (NMWimaxNsp *nsp, NMConnection *connection) * return connections which may be activated with the NSP. Any returned * connections will match the @nsp's network name and other attributes. * - * Returns: (transfer container) (element-type NMConnection): an array of + * Returns: (transfer full) (element-type NMConnection): an array of * #NMConnections that could be activated with the given @nsp. The array should * be freed with g_ptr_array_unref() when it is no longer required. **/