fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/trivial: rename nm_device_set_unmanaged_by_user_config() to nm_device_set_unmanaged_by_user_settings()

Browse source 
After all, it sets NM_UNMANAGED_USER_SETTINGS flag, so the name should
match with the flag.
This commit is contained in:
Thomas Haller 2016-05-17 12:12:50 +02:00
parent 0c4a23a438
commit 7c785a064e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1641,7 +1641,7 @@ device_link_changed (NMDevice *self)
ip_ifname_changed = !priv->ip_iface; ip_ifname_changed = !priv->ip_iface;
if (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT)) if (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT))
nm_device_set_unmanaged_by_user_config (self, nm_connection_provider_get_unmanaged_specs (priv->con_provider)); nm_device_set_unmanaged_by_user_settings (self, nm_connection_provider_get_unmanaged_specs (priv->con_provider));
else else
update_unmanaged_specs = TRUE; update_unmanaged_specs = TRUE;
@ -1719,7 +1719,7 @@ device_link_changed (NMDevice *self)
} }
if (update_unmanaged_specs) if (update_unmanaged_specs)
nm_device_set_unmanaged_by_user_config (self, nm_connection_provider_get_unmanaged_specs (priv->con_provider)); nm_device_set_unmanaged_by_user_settings (self, nm_connection_provider_get_unmanaged_specs (priv->con_provider));
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -9646,7 +9646,7 @@ nm_device_set_unmanaged_by_flags_queue (NMDevice *self,
} }
void void
nm_device_set_unmanaged_by_user_config (NMDevice *self, const GSList *unmanaged_specs) nm_device_set_unmanaged_by_user_settings (NMDevice *self, const GSList *unmanaged_specs)
{ {
NMDevicePrivate *priv; NMDevicePrivate *priv;
gboolean unmanaged; gboolean unmanaged;

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

@ -493,7 +493,7 @@ void nm_device_set_unmanaged_by_flags_queue (NMDevice *self,
NMUnmanagedFlags flags, NMUnmanagedFlags flags,
NMUnmanFlagOp set_op, NMUnmanFlagOp set_op,
NMDeviceStateReason reason); NMDeviceStateReason reason);
void nm_device_set_unmanaged_by_user_config (NMDevice *self, const GSList *unmanaged_specs); void nm_device_set_unmanaged_by_user_settings (NMDevice *self, const GSList *unmanaged_specs);
void nm_device_set_unmanaged_by_user_udev (NMDevice *self); void nm_device_set_unmanaged_by_user_udev (NMDevice *self);
void nm_device_set_unmanaged_by_quitting (NMDevice *device); void nm_device_set_unmanaged_by_quitting (NMDevice *device);

4
src/nm-manager.c
View file

@ -1235,7 +1235,7 @@ system_unmanaged_devices_changed_cb (NMSettings *settings,
unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings); unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
for (iter = priv->devices; iter; iter = g_slist_next (iter)) for (iter = priv->devices; iter; iter = g_slist_next (iter))
nm_device_set_unmanaged_by_user_config (NM_DEVICE (iter->data), unmanaged_specs); nm_device_set_unmanaged_by_user_settings (NM_DEVICE (iter->data), unmanaged_specs);
} }
static void static void
@ -1902,7 +1902,7 @@ add_device (NMManager *self, NMDevice *device, GError **error)
type_desc = nm_device_get_type_desc (device); type_desc = nm_device_get_type_desc (device);
g_assert (type_desc); g_assert (type_desc);
nm_device_set_unmanaged_by_user_config (device, nm_settings_get_unmanaged_specs (priv->settings)); nm_device_set_unmanaged_by_user_settings (device, nm_settings_get_unmanaged_specs (priv->settings));
nm_device_set_unmanaged_flags (device, nm_device_set_unmanaged_flags (device,
NM_UNMANAGED_SLEEPING, NM_UNMANAGED_SLEEPING,