diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
| commit | 08984bbd9d6c7c8a033c7d1466c25a34bcc21c0d (patch) | |
| tree | 53671bf0bb9d3f465b02a1bc149512a210da34a1 /libnm/nm-device.c | |
| parent | 0d06e842e34adca9a743de93979a7432961257c6 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Update upstream source from tag 'upstream/1.12.2'
Update to upstream version '1.12.2' with Debian dir 31e4999680481a4db05a3c008df492a8905a4ab3
Diffstat (limited to 'libnm/nm-device.c')
| -rw-r--r-- | libnm/nm-device.c | 19 |
1 files changed, 11 insertions, 8 deletions
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 |