Commit 93c83819 authored by Thomas Haller's avatar Thomas Haller

keyfile: rename files

Setting plugins should have their own name prefix (nms) and
keyfile should have as prefix "nms-kf". As a first step, rename
the files.
parent a63867a4
......@@ -384,16 +384,16 @@ libNetworkManager_la_SOURCES = \
settings/nm-settings.c \
settings/nm-settings.h \
\
settings/plugins/keyfile/nm-keyfile-connection.c \
settings/plugins/keyfile/nm-keyfile-connection.h \
settings/plugins/keyfile/plugin.c \
settings/plugins/keyfile/plugin.h \
settings/plugins/keyfile/reader.c \
settings/plugins/keyfile/reader.h \
settings/plugins/keyfile/utils.c \
settings/plugins/keyfile/utils.h \
settings/plugins/keyfile/writer.c \
settings/plugins/keyfile/writer.h \
settings/plugins/keyfile/nms-keyfile-connection.c \
settings/plugins/keyfile/nms-keyfile-connection.h \
settings/plugins/keyfile/nms-keyfile-plugin.c \
settings/plugins/keyfile/nms-keyfile-plugin.h \
settings/plugins/keyfile/nms-keyfile-reader.c \
settings/plugins/keyfile/nms-keyfile-reader.h \
settings/plugins/keyfile/nms-keyfile-utils.c \
settings/plugins/keyfile/nms-keyfile-utils.h \
settings/plugins/keyfile/nms-keyfile-writer.c \
settings/plugins/keyfile/nms-keyfile-writer.h \
\
supplicant-manager/nm-supplicant-config.c \
supplicant-manager/nm-supplicant-config.h \
......
......@@ -69,7 +69,7 @@
#include "nm-auth-utils.h"
#include "nm-auth-subject.h"
#include "nm-session-monitor.h"
#include "plugins/keyfile/plugin.h"
#include "plugins/keyfile/nms-keyfile-plugin.h"
#include "nm-agent-manager.h"
#include "nm-config.h"
#include "nm-audit-manager.h"
......
......@@ -21,22 +21,22 @@ noinst_LTLIBRARIES = \
##### I/O library for testcases #####
libkeyfile_io_la_SOURCES = \
reader.c \
reader.h \
writer.c \
writer.h \
utils.c \
utils.h
nms-keyfile-reader.c \
nms-keyfile-reader.h \
nms-keyfile-writer.c \
nms-keyfile-writer.h \
nms-keyfile-utils.c \
nms-keyfile-utils.h
libkeyfile_io_la_LIBADD = $(GLIB_LIBS)
#####################################
libnm_settings_plugin_keyfile_la_SOURCES = \
nm-keyfile-connection.c \
nm-keyfile-connection.h \
plugin.c \
plugin.h
nms-keyfile-connection.c \
nms-keyfile-connection.h \
nms-keyfile-plugin.c \
nms-keyfile-plugin.h
libnm_settings_plugin_keyfile_la_LIBADD = \
libkeyfile-io.la
......
......@@ -21,6 +21,8 @@
#include "nm-default.h"
#include "nms-keyfile-connection.h"
#include <string.h>
#include <glib/gstdio.h>
......@@ -29,10 +31,10 @@
#include "nm-utils.h"
#include "nm-settings-plugin.h"
#include "nm-keyfile-connection.h"
#include "reader.h"
#include "writer.h"
#include "utils.h"
#include "nms-keyfile-reader.h"
#include "nms-keyfile-writer.h"
#include "nms-keyfile-utils.h"
G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION)
......
......@@ -21,7 +21,7 @@
#include "nm-default.h"
#include "plugin.h"
#include "nms-keyfile-plugin.h"
#include <sys/stat.h>
#include <unistd.h>
......@@ -38,9 +38,10 @@
#include "nm-core-internal.h"
#include "nm-settings-plugin.h"
#include "nm-keyfile-connection.h"
#include "writer.h"
#include "utils.h"
#include "nms-keyfile-connection.h"
#include "nms-keyfile-writer.h"
#include "nms-keyfile-utils.h"
/*****************************************************************************/
......
......@@ -20,12 +20,13 @@
#include "nm-default.h"
#include "nms-keyfile-reader.h"
#include <sys/stat.h>
#include <string.h>
#include "reader.h"
#include "nm-keyfile-internal.h"
#include "NetworkManagerUtils.h"
static const char *
......
......@@ -20,10 +20,11 @@
#include "nm-default.h"
#include "nms-keyfile-utils.h"
#include <stdlib.h>
#include <string.h>
#include "utils.h"
#include "nm-setting-wired.h"
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
......
......@@ -21,16 +21,18 @@
#include "nm-default.h"
#include "nms-keyfile-writer.h"
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <string.h>
#include "writer.h"
#include "utils.h"
#include "nm-keyfile-internal.h"
#include "nms-keyfile-utils.h"
typedef struct {
const char *keyfile_dir;
} WriteInfo;
......
......@@ -24,9 +24,9 @@ noinst_PROGRAMS = test-keyfile
test_keyfile_SOURCES = \
test-keyfile.c \
../reader.c \
../writer.c \
../utils.c
../nms-keyfile-reader.c \
../nms-keyfile-writer.c \
../nms-keyfile-utils.c
test_keyfile_LDADD = \
$(top_builddir)/src/libNetworkManager.la \
......
......@@ -30,9 +30,9 @@
#include "nm-core-internal.h"
#include "reader.h"
#include "writer.h"
#include "utils.h"
#include "nms-keyfile-reader.h"
#include "nms-keyfile-writer.h"
#include "nms-keyfile-utils.h"
#include "nm-test-utils-core.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment