fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 16:00:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnm: add (allow-none) annotations to nm_device_reapply()

Browse source 
The @connection argument can be NULL; add the (allow-none) annotation
otherwise calling the API with a NULL argument through GObject
introspection fails with:

 Argument 1 does not allow None as a value

Fixes: 278fd4fb0f
(cherry picked from commit f396826466)
(cherry picked from commit a03b867ba4)
This commit is contained in:
Beniamino Galvani 2018-07-04 13:56:25 +02:00
parent 00bdd67e08
commit cd6c17cb21
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libnm/nm-device.c
View file

@ -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
@ -1970,10 +1971,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