diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-29 15:34:55 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-09-29 15:34:55 +0200 |
| commit | 937ee1de82e9d080787c0709e8db9c55bbe5523f (patch) | |
| tree | 9047e9788010d9fb4efe6cac2f614f2bc133fdb5 | |
| parent | 32efb87d4dab81fe294d2a286e290f328d1662a1 (diff) | |
| download | NetworkManager-937ee1de82e9d080787c0709e8db9c55bbe5523f.tar.gz | |
core: rename NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED enum
NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE sounds better.
| -rw-r--r-- | src/nm-policy.c | 8 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.c | 4 | ||||
| -rw-r--r-- | src/settings/nm-settings-connection.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c index 4e079d7b50..ccec244c45 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -1425,7 +1425,7 @@ reset_autoconnect_all (NMPolicy *self, NMDevice *device) if (!device || nm_device_check_connection_compatible (device, NM_CONNECTION (connection))) { nm_settings_connection_reset_autoconnect_retries (connection); - nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED); + nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE); } } } @@ -1445,7 +1445,7 @@ reset_autoconnect_for_failed_secrets (NMPolicy *self) if (nm_settings_connection_get_autoconnect_blocked_reason (connection) == NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS) { nm_settings_connection_reset_autoconnect_retries (connection); - nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED); + nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE); } } } @@ -1635,7 +1635,7 @@ activate_slave_connections (NMPolicy *self, NMDevice *device) reason = nm_settings_connection_get_autoconnect_blocked_reason (settings); if (reason == NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED) { - reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED; + reason = NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE; nm_settings_connection_set_autoconnect_blocked_reason (settings, reason); } } @@ -1851,7 +1851,7 @@ device_state_changed (NMDevice *device, case NM_DEVICE_STATE_IP_CONFIG: /* We must have secrets if we got here. */ if (connection) - nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED); + nm_settings_connection_set_autoconnect_blocked_reason (connection, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE); break; case NM_DEVICE_STATE_SECONDARIES: if (connection) diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index 15d51baafc..9d32bb886b 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -2620,7 +2620,7 @@ nm_settings_connection_set_autoconnect_blocked_reason (NMSettingsConnection *sel NMSettingsAutoconnectBlockedReason reason) { g_return_if_fail (NM_IN_SET (reason, - NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED, + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS)); @@ -2636,7 +2636,7 @@ nm_settings_connection_can_autoconnect (NMSettingsConnection *self) if ( !priv->visible || priv->autoconnect_retries == 0 - || priv->autoconnect_blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED) + || priv->autoconnect_blocked_reason != NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE) return FALSE; s_con = nm_connection_get_setting_connection (NM_CONNECTION (self)); diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index 6dcc4f40c0..ecfac07905 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -83,7 +83,7 @@ typedef enum { /*< skip >*/ } NMSettingsConnectionCommitReason; typedef enum { - NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_UNBLOCKED = 0, + NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NONE = 0, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_USER_REQUEST = 1, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_FAILED = 2, NM_SETTINGS_AUTO_CONNECT_BLOCKED_REASON_NO_SECRETS = 3, |