From caf1db9d6fbc056cc6c76a24574890f6c7895f3d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 25 Jul 2018 13:12:18 +0200 Subject: New upstream version 1.12.2 --- libnm/nm-device.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'libnm/nm-device.c') diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 0ae3da53..d841ca37 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1907,10 +1907,11 @@ nm_device_is_software (NMDevice *device) /** * nm_device_reapply: * @device: a #NMDevice - * @connection: the #NMConnection to replace the applied settings with or %NULL to reuse existing - * @version_id: zero or the expected version id of the applied connection. If specified - * and the version id mismatches, the call fails without modification. This allows to - * catch concurrent accesses. + * @connection: (allow-none): the #NMConnection to replace the applied + * settings with or %NULL to reuse existing + * @version_id: zero or the expected version id of the applied connection. + * If specified and the version id mismatches, the call fails without + * modification. This allows to catch concurrent accesses. * @flags: always set this to zero * @cancellable: a #GCancellable, or %NULL * @error: location for a #GError, or %NULL @@ -1969,10 +1970,12 @@ device_reapply_cb (GObject *proxy, /** * nm_device_reapply_async: * @device: a #NMDevice - * @connection: the #NMConnection to replace the applied settings with or %NULL to reuse existing - * @version_id: zero or the expected version id of the applied connection. If specified - * and the version id mismatches, the call fails without modification. This allows to - * catch concurrent accesses. + * @connection: (allow-none): the #NMConnection to replace the applied + * settings with or %NULL to reuse existing + * @version_id: zero or the expected version id of the applied + * connection. If specified and the version id mismatches, the call + * fails without modification. This allows to catch concurrent + * accesses. * @flags: always set this to zero * @cancellable: a #GCancellable, or %NULL * @callback: callback to be called when the reapply operation completes -- cgit 1.3.0-6-gf8a5