summaryrefslogtreecommitdiff
path: root/src/settings/plugins/keyfile
diff options
context:
space:
mode:
Diffstat (limited to 'src/settings/plugins/keyfile')
-rw-r--r--src/settings/plugins/keyfile/Makefile.am2
-rw-r--r--src/settings/plugins/keyfile/common.h2
-rw-r--r--src/settings/plugins/keyfile/nm-keyfile-connection.c2
-rw-r--r--src/settings/plugins/keyfile/plugin.c6
-rw-r--r--src/settings/plugins/keyfile/plugin.h2
-rw-r--r--src/settings/plugins/keyfile/reader.c2
-rw-r--r--src/settings/plugins/keyfile/reader.h2
-rw-r--r--src/settings/plugins/keyfile/tests/Makefile.am2
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile.c2
-rw-r--r--src/settings/plugins/keyfile/utils.c3
-rw-r--r--src/settings/plugins/keyfile/utils.h2
-rw-r--r--src/settings/plugins/keyfile/writer.c4
-rw-r--r--src/settings/plugins/keyfile/writer.h2
13 files changed, 14 insertions, 19 deletions
diff --git a/src/settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
index 079c45c39e..dc14261c80 100644
--- a/src/settings/plugins/keyfile/Makefile.am
+++ b/src/settings/plugins/keyfile/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
- -DNETWORKMANAGER_COMPILATION \
+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
diff --git a/src/settings/plugins/keyfile/common.h b/src/settings/plugins/keyfile/common.h
index 871a745923..19fa18c997 100644
--- a/src/settings/plugins/keyfile/common.h
+++ b/src/settings/plugins/keyfile/common.h
@@ -21,7 +21,7 @@
#ifndef __COMMON_H__
#define __COMMON_H__
-#include "nm-glib.h"
+#include "nm-default.h"
#define KEYFILE_PLUGIN_NAME "keyfile"
#define KEYFILE_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
index 744ae9ccf3..06504a99b6 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c
@@ -27,6 +27,7 @@
#include <nm-setting-connection.h>
#include <nm-utils.h>
+#include "nm-default.h"
#include "nm-system-config-interface.h"
#include "nm-dbus-glib-types.h"
#include "nm-keyfile-connection.h"
@@ -34,7 +35,6 @@
#include "writer.h"
#include "common.h"
#include "utils.h"
-#include "gsystem-local-alloc.h"
#include "nm-logging.h"
G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION)
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index f34dc9fb3f..467cbdbf0e 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -33,9 +33,8 @@
#include <nm-setting.h>
#include <nm-setting-connection.h>
#include <nm-utils.h>
-#include <nm-config.h>
-#include <nm-logging.h>
-#include "nm-glib.h"
+#include "nm-config.h"
+#include "nm-default.h"
#include "nm-core-internal.h"
#include "plugin.h"
@@ -44,7 +43,6 @@
#include "writer.h"
#include "common.h"
#include "utils.h"
-#include "gsystem-local-alloc.h"
static void system_config_interface_init (NMSystemConfigInterface *system_config_interface_class);
diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h
index 4d77a92596..143fead522 100644
--- a/src/settings/plugins/keyfile/plugin.h
+++ b/src/settings/plugins/keyfile/plugin.h
@@ -22,7 +22,7 @@
#ifndef _PLUGIN_H_
#define _PLUGIN_H_
-#include "nm-glib.h"
+#include "nm-default.h"
#define SC_TYPE_PLUGIN_KEYFILE (sc_plugin_keyfile_get_type ())
#define SC_PLUGIN_KEYFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_KEYFILE, SCPluginKeyfile))
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index bd08c17d04..1c984a16d4 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -25,7 +25,7 @@
#include "reader.h"
-#include "nm-logging.h"
+#include "nm-default.h"
#include "nm-keyfile-internal.h"
#include "NetworkManagerUtils.h"
diff --git a/src/settings/plugins/keyfile/reader.h b/src/settings/plugins/keyfile/reader.h
index 44bf55cb2d..a8021cb744 100644
--- a/src/settings/plugins/keyfile/reader.h
+++ b/src/settings/plugins/keyfile/reader.h
@@ -24,7 +24,7 @@
#include <nm-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
NMConnection *nm_keyfile_plugin_connection_from_file (const char *filename, GError **error);
diff --git a/src/settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
index a79e20b5b6..221c1de0fe 100644
--- a/src/settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
- -DNETWORKMANAGER_COMPILATION \
+ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 28e9eb447f..375f0d8383 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -29,7 +29,7 @@
#include <sys/socket.h>
#include "nm-core-internal.h"
-#include "nm-logging.h"
+#include "nm-default.h"
#include "reader.h"
#include "writer.h"
diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
index 1685e22b53..4300b0dcb4 100644
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/utils.c
@@ -22,8 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include "nm-glib.h"
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
#include "utils.h"
#include <nm-setting-wired.h>
#include <nm-setting-wireless.h>
diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h
index a4c136500b..427cd5f64d 100644
--- a/src/settings/plugins/keyfile/utils.h
+++ b/src/settings/plugins/keyfile/utils.h
@@ -21,7 +21,7 @@
#ifndef _UTILS_H_
#define _UTILS_H_
-#include "nm-glib.h"
+#include "nm-default.h"
#include "NetworkManagerUtils.h"
#define NM_KEYFILE_CONNECTION_LOG_PATH(path) str_if_set (path,"in-memory")
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index d5c087d2f7..d3c292bdcf 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -27,13 +27,11 @@
#include <errno.h>
#include <string.h>
-#include "nm-glib.h"
-#include "nm-logging.h"
+#include "nm-default.h"
#include "writer.h"
#include "common.h"
#include "utils.h"
#include "nm-keyfile-internal.h"
-#include "gsystem-local-alloc.h"
typedef struct {
const char *keyfile_dir;
diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h
index e7bb346c20..25f44e941e 100644
--- a/src/settings/plugins/keyfile/writer.h
+++ b/src/settings/plugins/keyfile/writer.h
@@ -24,7 +24,7 @@
#include <nm-connection.h>
-#include "nm-glib.h"
+#include "nm-default.h"
gboolean nm_keyfile_plugin_write_connection (NMConnection *connection,
const char *existing_path,
View Lorry Controller Status