diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-01-11 09:36:47 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-01-12 09:51:44 +0100 |
| commit | 9b94d33232bf8251a13a56ca24920597a542b4bf (patch) | |
| tree | 7e57c66624364b179f6979b560fb47c46ef19347 | |
| parent | 59dc2eb29a597ada224ff73fb8ba41eb40ebfc20 (diff) | |
| download | NetworkManager-9b94d33232bf8251a13a56ca24920597a542b4bf.tar.gz | |
libnm: add versioning comments and macros to nm_device_reapply*()
Fixes: 278fd4fb0fde3f290e366dab91fb6a49f9ff186c
| -rw-r--r-- | libnm/nm-device.c | 6 | ||||
| -rw-r--r-- | libnm/nm-device.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 1e14658d28..7d57b52699 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2176,6 +2176,8 @@ nm_device_is_software (NMDevice *device) * made since it was last applied. * * Returns: %TRUE on success, %FALSE on error, in which case @error will be set. + * + * Since: 1.2 **/ gboolean nm_device_reapply (NMDevice *device, @@ -2232,6 +2234,8 @@ device_reapply_cb (GObject *proxy, * * Asynchronously begins an attempt to update device with changes to the * currently active connection made since it was last applied. + * + * Since: 1.2 **/ void nm_device_reapply_async (NMDevice *device, @@ -2269,6 +2273,8 @@ nm_device_reapply_async (NMDevice *device, * * Returns: %TRUE on success, %FALSE on error, in which case @error * will be set. + * + * Since: 1.2 **/ gboolean nm_device_reapply_finish (NMDevice *device, diff --git a/libnm/nm-device.h b/libnm/nm-device.h index c9d619fc6c..bf845cebff 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -137,18 +137,20 @@ NM_AVAILABLE_IN_1_2 GPtrArray * nm_device_get_lldp_neighbors (NMDevice *device); char ** nm_device_disambiguate_names (NMDevice **devices, int num_devices); - +NM_AVAILABLE_IN_1_2 gboolean nm_device_reapply (NMDevice *device, NMConnection *connection, guint flags, GCancellable *cancellable, GError **error); +NM_AVAILABLE_IN_1_2 void nm_device_reapply_async (NMDevice *device, NMConnection *connection, guint flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); +NM_AVAILABLE_IN_1_2 gboolean nm_device_reapply_finish (NMDevice *device, GAsyncResult *result, GError **error); |