fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 06:30:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: simplify nm_device_set_is_nm_owned()

Browse source 
Nothing used its return value or passed FALSE.
This commit is contained in:
Dan Williams 2014-05-20 16:56:29 -05:00
parent f3fbbf4a77
commit 4809898e08
3 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/devices/nm-device.c
View file

@ -4722,22 +4722,12 @@ nm_device_get_is_nm_owned (NMDevice *device)
return NM_DEVICE_GET_PRIVATE (device)->is_nm_owned;
}
gboolean
nm_device_set_is_nm_owned (NMDevice *device,
gboolean is_nm_owned)
void
nm_device_set_nm_owned (NMDevice *device)
{
NMDevicePrivate *priv;
g_return_if_fail (NM_IS_DEVICE (device));
g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
priv = NM_DEVICE_GET_PRIVATE (device);
if (is_nm_owned == priv->is_nm_owned)
return TRUE;
if (!is_nm_owned)
return FALSE;
priv->is_nm_owned = TRUE;
return TRUE;
NM_DEVICE_GET_PRIVATE (device)->is_nm_owned = TRUE;
}
/*

3
src/devices/nm-device.h
View file

@ -317,8 +317,7 @@ void nm_device_set_initial_unmanaged_flag (NMDevice *device,
gboolean unmanaged);
gboolean nm_device_get_is_nm_owned (NMDevice *device);
gboolean nm_device_set_is_nm_owned (NMDevice *device,
gboolean is_nm_owned);
void nm_device_set_nm_owned (NMDevice *device);
gboolean nm_device_get_autoconnect (NMDevice *device);

2
src/nm-manager.c
View file

@ -1086,7 +1086,7 @@ system_create_virtual_device (NMManager *self, NMConnection *connection)
}
if (device) {
nm_device_set_is_nm_owned (device, TRUE);
nm_device_set_nm_owned (device);
add_device (self, device, FALSE);
g_object_unref (device);
}