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.

diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 242fe7e..3e887f7 100644 (file)
--- 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 87fcb03..c16ead9 100644 (file)
--- 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 f20a0fc..e5b5e63 100644 (file)
--- 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);