colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: fix signature for @flags argument of impl_device_reapply()

Browse Source 
Thereby, also adjust the type for libnm's wrapper function -- as
we already broke ABI.
This commit is contained in:
Thomas Haller
2016-02-12 14:02:53 +01:00
parent 4bd45b9458
commit 54dc789314
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libnm/nm-device.c
View File

@@ -2185,7 +2185,7 @@ gboolean
nm_device_reapply (NMDevice *device, nm_device_reapply (NMDevice *device,
NMConnection *connection, NMConnection *connection,
guint64 version_id, guint64 version_id,
guint flags, guint32 flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
@@ -2247,7 +2247,7 @@ void
nm_device_reapply_async (NMDevice *device, nm_device_reapply_async (NMDevice *device,
NMConnection *connection, NMConnection *connection,
guint64 version_id, guint64 version_id,
guint flags, guint32 flags,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)

4
libnm/nm-device.h
View File

@@ -141,14 +141,14 @@ NM_AVAILABLE_IN_1_2
gboolean nm_device_reapply (NMDevice *device, gboolean nm_device_reapply (NMDevice *device,
NMConnection *connection, NMConnection *connection,
guint64 version_id, guint64 version_id,
guint flags, guint32 flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
NM_AVAILABLE_IN_1_2 NM_AVAILABLE_IN_1_2
void nm_device_reapply_async (NMDevice *device, void nm_device_reapply_async (NMDevice *device,
NMConnection *connection, NMConnection *connection,
guint64 version_id, guint64 version_id,
guint flags, guint32 flags,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);

4
src/devices/nm-device.c
View File

@@ -7307,7 +7307,7 @@ impl_device_reapply (NMDevice *self,
GDBusMethodInvocation *context, GDBusMethodInvocation *context,
GVariant *settings, GVariant *settings,
guint64 version_id, guint64 version_id,
guint flags) guint32 flags)
{ {
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self); NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
NMSettingsConnection *settings_connection; NMSettingsConnection *settings_connection;
@@ -7318,7 +7318,7 @@ impl_device_reapply (NMDevice *self,
/* No flags supported as of now. */ /* No flags supported as of now. */
if (flags != 0) { if (flags != 0) {
error = g_error_new_literal (NM_DEVICE_ERROR, error = g_error_new_literal (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_NOT_ACTIVE, NM_DEVICE_ERROR_FAILED,
"Invalid flags specified"); "Invalid flags specified");
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_REAPPLY, self, FALSE, context, error->message); nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_REAPPLY, self, FALSE, context, error->message);
g_dbus_method_invocation_take_error (context, error); g_dbus_method_invocation_take_error (context, error);