diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-11 21:12:00 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-02 15:50:03 +0200 |
| commit | 7fbfaf567df0562e6b9c39954087dc897c5e05b6 (patch) | |
| tree | b1baf2614cd4fb74ab7eba18b698eee2c8e6bd2d /src | |
| parent | e1b0195c67d16f6fd44770828e912d190f2cd888 (diff) | |
| download | NetworkManager-7fbfaf567df0562e6b9c39954087dc897c5e05b6.tar.gz | |
libnm: consider ordering for _nm_keyfile_equals()
GKeyFile considers the order of the files, so add a possibility
to check whether to keyfiles are equal -- also with respect to
the order of the elements.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nm-config-data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-config-data.c b/src/nm-config-data.c index c8376132f7..d5e8314656 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -317,7 +317,7 @@ nm_config_data_diff (NMConfigData *old_data, NMConfigData *new_data) priv_old = NM_CONFIG_DATA_GET_PRIVATE (old_data); priv_new = NM_CONFIG_DATA_GET_PRIVATE (new_data); - if (!_nm_keyfile_equals (priv_old->keyfile, priv_new->keyfile)) + if (!_nm_keyfile_equals (priv_old->keyfile, priv_new->keyfile, TRUE)) changes |= NM_CONFIG_CHANGE_VALUES; if ( g_strcmp0 (nm_config_data_get_config_main_file (old_data), nm_config_data_get_config_main_file (new_data)) != 0 |