From 72d2e5e6a9922603099650390e5be45cb59ec8e9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 21 Oct 2018 15:44:33 +0200 Subject: keyfile: move and rename NM_CONFIG_KEYFILE_PATH_DEFAULT define --- libnm-core/nm-keyfile-internal.h | 1 + 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 #include +#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; } -- cgit v1.2.1