diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-07 18:42:24 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-07 18:52:12 +0200 |
| commit | d0836be0ebb3faa1aaf8f4ac0ec7b52fed011cc2 (patch) | |
| tree | 1a5e746aa9e7e2beb708dffe81233975ebd249c1 /src/tests | |
| parent | e3a30665d72e82cc8f9b67becfdd85c000235824 (diff) | |
| download | NetworkManager-d0836be0ebb3faa1aaf8f4ac0ec7b52fed011cc2.tar.gz | |
core: rename nm_config_run_state* to nm_config_state*
After all, this state is stored persistently to /var/lib/NetworkManager,
and not to volatile storage in /var/run. Hence the name is better.
It's also shorter, so rename it.
The commit is mostly trivial, including update of code comments
and logging messages.
Fixes: 1b43c880ba43260fe551b0ac923826f16737484f
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/config/test-config.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 08f33f813f..9d39c69a80 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -934,7 +934,7 @@ static void test_config_state_file (void) { NMConfig *config; - const NMConfigRunState *state; + const NMConfigState *state; gs_unref_object GFile *src = NULL, *dst = NULL; const char *tmp_file = BUILDDIR "/tmp.state"; GError *error = NULL; @@ -952,19 +952,19 @@ test_config_state_file (void) "--state-file", tmp_file, NULL); g_assert (config); - state = nm_config_run_state_get (config); + state = nm_config_state_get (config); g_assert (state); g_assert_cmpint (state->net_enabled, ==, TRUE); g_assert_cmpint (state->wifi_enabled, ==, TRUE); g_assert_cmpint (state->wwan_enabled, ==, TRUE); - nm_config_run_state_set (config, TRUE, TRUE, - NM_CONFIG_RUN_STATE_PROPERTY_NETWORKING_ENABLED, FALSE, - NM_CONFIG_RUN_STATE_PROPERTY_WIFI_ENABLED, TRUE, - NM_CONFIG_RUN_STATE_PROPERTY_WWAN_ENABLED, FALSE); + nm_config_state_set (config, TRUE, TRUE, + NM_CONFIG_STATE_PROPERTY_NETWORKING_ENABLED, FALSE, + NM_CONFIG_STATE_PROPERTY_WIFI_ENABLED, TRUE, + NM_CONFIG_STATE_PROPERTY_WWAN_ENABLED, FALSE); - state = nm_config_run_state_get (config); + state = nm_config_state_get (config); g_assert (state); g_assert_cmpint (state->net_enabled, ==, FALSE); @@ -978,7 +978,7 @@ test_config_state_file (void) "--state-file", tmp_file, NULL); g_assert (config); - state = nm_config_run_state_get (config); + state = nm_config_state_get (config); g_assert (state); g_assert_cmpint (state->net_enabled, ==, FALSE); |