fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 11:20:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

keyfile: move and rename NM_CONFIG_KEYFILE_PATH_DEFAULT define

Browse source
This commit is contained in:
Thomas Haller 2018-10-21 15:44:33 +02:00
parent e93d8cdb74
commit 83acb40a86
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnm-core/nm-keyfile-internal.h
View file

@ -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"

5
src/settings/plugins/keyfile/nms-keyfile-utils.c
View file

@ -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;
}