diff options
| author | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-03-01 16:55:22 +0100 |
| commit | c2de0d98ba39e0a1a970d066fd19be786092f376 (patch) | |
| tree | 3838363c06a6019db6cf1f882ea34ebded63c38b /libnm/nm-device.h | |
| parent | 494f296a3baab08522617b24b1f126d8f9a17502 (diff) | |
Imported Upstream version 1.1.91 upstream/1.1.91
Diffstat (limited to 'libnm/nm-device.h')
| -rw-r--r-- | libnm/nm-device.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/libnm/nm-device.h b/libnm/nm-device.h index bf845ceb..c16ead9e 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -140,13 +140,15 @@ char ** nm_device_disambiguate_names (NMDevice **devices, NM_AVAILABLE_IN_1_2 gboolean nm_device_reapply (NMDevice *device, NMConnection *connection, - guint flags, + guint64 version_id, + guint32 flags, GCancellable *cancellable, GError **error); NM_AVAILABLE_IN_1_2 void nm_device_reapply_async (NMDevice *device, NMConnection *connection, - guint flags, + guint64 version_id, + guint32 flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -155,6 +157,24 @@ gboolean nm_device_reapply_finish (NMDevice *device, GAsyncResult *result, GError **error); +NM_AVAILABLE_IN_1_2 +NMConnection *nm_device_get_applied_connection (NMDevice *device, + guint32 flags, + guint64 *version_id, + GCancellable *cancellable, + GError **error); +NM_AVAILABLE_IN_1_2 +void nm_device_get_applied_connection_async (NMDevice *device, + guint32 flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +NM_AVAILABLE_IN_1_2 +NMConnection *nm_device_get_applied_connection_finish (NMDevice *device, + GAsyncResult *result, + guint64 *version_id, + GError **error); + gboolean nm_device_disconnect (NMDevice *device, GCancellable *cancellable, GError **error); |