diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-10-21 15:44:33 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-10-22 14:17:21 +0200 |
| commit | 72d2e5e6a9922603099650390e5be45cb59ec8e9 (patch) | |
| tree | 2517511498d88918721eba5e673a68d0b7091df2 | |
| parent | 7c109e07b3225c506ad5198d259f59313bc311e6 (diff) | |
| download | NetworkManager-th/keyfile-filename-utils.tar.gz | |
keyfile: move and rename NM_CONFIG_KEYFILE_PATH_DEFAULT defineth/keyfile-filename-utils
| -rw-r--r-- | libnm-core/nm-keyfile-internal.h | 1 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/nms-keyfile-utils.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h index 5275216241..98df586596 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile-internal.h @@ -170,6 +170,7 @@ gboolean _nm_keyfile_has_values (GKeyFile *keyfile); /*****************************************************************************/ +#define NM_KEYFILE_PATH_NAME_ETC_DEFAULT NMCONFDIR "/system-connections" #define NM_KEYFILE_PATH_NAME_RUN NMRUNDIR "/system-connections" #define NM_KEYFILE_PATH_SUFFIX_NMCONNECTION ".nmconnection" diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c index d76102e500..98eecd7ca7 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-utils.c +++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c @@ -26,13 +26,12 @@ #include <string.h> #include <sys/stat.h> +#include "nm-keyfile-internal.h" #include "nm-setting-wired.h" #include "nm-setting-wireless.h" #include "nm-setting-wireless-security.h" #include "nm-config.h" -#define NM_CONFIG_KEYFILE_PATH_DEFAULT NMCONFDIR "/system-connections" - /*****************************************************************************/ gboolean @@ -103,7 +102,7 @@ nms_keyfile_utils_get_path (void) NM_CONFIG_KEYFILE_KEY_KEYFILE_PATH, NM_CONFIG_GET_VALUE_STRIP | NM_CONFIG_GET_VALUE_NO_EMPTY); if (!path) - path = g_strdup (""NM_CONFIG_KEYFILE_PATH_DEFAULT""); + path = g_strdup (""NM_KEYFILE_PATH_NAME_ETC_DEFAULT""); } return path; } |