diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-17 12:12:50 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-05-17 12:12:50 +0200 |
| commit | 7c785a064e8a7515432e3a8cb61afa899c8797ce (patch) | |
| tree | 6033ded315d37512ece66ac3339b18aacd098868 | |
| parent | 0c4a23a43806dedd30711b9b1ec8ad62f29b0387 (diff) | |
| download | NetworkManager-7c785a064e8a7515432e3a8cb61afa899c8797ce.tar.gz | |
device/trivial: rename nm_device_set_unmanaged_by_user_config() to nm_device_set_unmanaged_by_user_settings()
After all, it sets NM_UNMANAGED_USER_SETTINGS flag, so the name should
match with the flag.
| -rw-r--r-- | src/devices/nm-device.c | 6 | ||||
| -rw-r--r-- | src/devices/nm-device.h | 2 | ||||
| -rw-r--r-- | src/nm-manager.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index a89e88d434..ce6ad5d984 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1641,7 +1641,7 @@ device_link_changed (NMDevice *self) ip_ifname_changed = !priv->ip_iface; 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 update_unmanaged_specs = TRUE; @@ -1719,7 +1719,7 @@ device_link_changed (NMDevice *self) } 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; } @@ -9646,7 +9646,7 @@ nm_device_set_unmanaged_by_flags_queue (NMDevice *self, } 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; gboolean unmanaged; diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 2180439631..3dada1ad4f 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -493,7 +493,7 @@ void nm_device_set_unmanaged_by_flags_queue (NMDevice *self, NMUnmanagedFlags flags, NMUnmanFlagOp set_op, 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_quitting (NMDevice *device); diff --git a/src/nm-manager.c b/src/nm-manager.c index ccf130a2c6..9e782e4b80 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1235,7 +1235,7 @@ system_unmanaged_devices_changed_cb (NMSettings *settings, unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings); 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 @@ -1902,7 +1902,7 @@ add_device (NMManager *self, NMDevice *device, GError **error) type_desc = nm_device_get_type_desc (device); 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_UNMANAGED_SLEEPING, |