diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-02-12 14:02:53 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-02-16 11:24:49 +0100 |
| commit | 54dc78931475cf4d25f562e39aa61745a7c4a2dd (patch) | |
| tree | 2fdb448fe04f91820bac41ec1e2aed5f163c53d3 | |
| parent | 4bd45b94588b42672dbf4c13e8cb574a3b8d5e2c (diff) | |
| download | NetworkManager-54dc78931475cf4d25f562e39aa61745a7c4a2dd.tar.gz | |
device: fix signature for @flags argument of impl_device_reapply()
Thereby, also adjust the type for libnm's wrapper function -- as
we already broke ABI.
| -rw-r--r-- | libnm/nm-device.c | 4 | ||||
| -rw-r--r-- | libnm/nm-device.h | 4 | ||||
| -rw-r--r-- | src/devices/nm-device.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 242fe7e197..3e887f79ea 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2185,7 +2185,7 @@ gboolean nm_device_reapply (NMDevice *device, NMConnection *connection, guint64 version_id, - guint flags, + guint32 flags, GCancellable *cancellable, GError **error) { @@ -2247,7 +2247,7 @@ void nm_device_reapply_async (NMDevice *device, NMConnection *connection, guint64 version_id, - guint flags, + guint32 flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data) diff --git a/libnm/nm-device.h b/libnm/nm-device.h index 87fcb0335e..c16ead9ed2 100644 --- a/libnm/nm-device.h +++ b/libnm/nm-device.h @@ -141,14 +141,14 @@ NM_AVAILABLE_IN_1_2 gboolean nm_device_reapply (NMDevice *device, NMConnection *connection, guint64 version_id, - guint flags, + guint32 flags, GCancellable *cancellable, GError **error); NM_AVAILABLE_IN_1_2 void nm_device_reapply_async (NMDevice *device, NMConnection *connection, guint64 version_id, - guint flags, + guint32 flags, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index f20a0fc581..e5b5e63472 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -7307,7 +7307,7 @@ impl_device_reapply (NMDevice *self, GDBusMethodInvocation *context, GVariant *settings, guint64 version_id, - guint flags) + guint32 flags) { NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMSettingsConnection *settings_connection; @@ -7318,7 +7318,7 @@ impl_device_reapply (NMDevice *self, /* No flags supported as of now. */ if (flags != 0) { error = g_error_new_literal (NM_DEVICE_ERROR, - NM_DEVICE_ERROR_NOT_ACTIVE, + NM_DEVICE_ERROR_FAILED, "Invalid flags specified"); nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_REAPPLY, self, FALSE, context, error->message); g_dbus_method_invocation_take_error (context, error); |