summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-04-15 09:23:31 +0200
committerThomas Haller <thaller@redhat.com>2019-04-18 20:03:54 +0200
commit87f7e6844d2eae7f82511bf9c05a474c8adbb718 (patch)
tree29f8eefe5f951a53077a2186bcf4738e78273ba9 /src
parentd984b2ce4a119428c2003120ea306198ba068df2 (diff)
downloadNetworkManager-87f7e6844d2eae7f82511bf9c05a474c8adbb718.tar.gz
shared: move "nm-dbus-compat.h" header to "nm-std-aux/nm-dbus-compat.h"
(cherry picked from commit 81833358786b0fdd0668ef92b0bdc1361fa980b3)
Diffstat (limited to 'src')
-rw-r--r--src/devices/bluetooth/nm-bluez-manager.c2
-rw-r--r--src/devices/team/nm-device-team.c2
-rw-r--r--src/devices/wifi/nm-device-iwd.c2
-rw-r--r--src/devices/wwan/nm-modem-manager.c2
-rw-r--r--src/dns/nm-dns-systemd-resolved.c2
-rw-r--r--src/nm-dbus-manager.c2
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c2
-rw-r--r--src/supplicant/nm-supplicant-interface.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index dc85a8b287..9cd3a51973 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -35,7 +35,7 @@
#include "nm-device-bt.h"
#include "nm-core-internal.h"
#include "platform/nm-platform.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
/*****************************************************************************/
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index 9cab0d2412..287f4d1b18 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -37,7 +37,7 @@
#include "nm-config.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index dcc161d28f..4a9503f312 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -39,7 +39,7 @@
#include "nm-config.h"
#include "nm-iwd-manager.h"
#include "nm-dbus-manager.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceIwd);
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
index fac14d69d6..4be089c099 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/devices/wwan/nm-modem-manager.c
@@ -32,7 +32,7 @@
#define sd_booted() FALSE
#endif
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "nm-modem.h"
#include "nm-modem-broadband.h"
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c
index 68ffd80c42..5d262ba3c7 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/dns/nm-dns-systemd-resolved.c
@@ -42,7 +42,7 @@
#include "nm-setting-connection.h"
#include "devices/nm-device.h"
#include "NetworkManagerUtils.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"
#define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager"
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index c1300eaf99..1a455c4280 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -31,7 +31,7 @@
#include "nm-glib-aux/nm-c-list.h"
#include "nm-dbus-interface.h"
#include "nm-core-internal.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "nm-dbus-object.h"
#include "NetworkManagerUtils.h"
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 61525e204e..51065545f7 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -54,7 +54,7 @@
#include "nm-core-internal.h"
#include "nm-config.h"
#include "nm-audit-manager.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "nm-checkpoint.h"
#include "nm-checkpoint-manager.h"
#include "nm-dbus-object.h"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index 89272edbb3..5160dbf0e2 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -30,7 +30,7 @@
#include <sys/stat.h>
#include <gmodule.h>
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#include "nm-setting-connection.h"
#include "settings/nm-settings-plugin.h"
#include "nm-config.h"
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index f46689eb02..12d21aba44 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -29,7 +29,7 @@
#include "NetworkManagerUtils.h"
#include "nm-supplicant-config.h"
#include "nm-core-internal.h"
-#include "nm-dbus-compat.h"
+#include "nm-std-aux/nm-dbus-compat.h"
#define WPAS_DBUS_IFACE_INTERFACE WPAS_DBUS_INTERFACE ".Interface"
#define WPAS_DBUS_IFACE_INTERFACE_WPS WPAS_DBUS_INTERFACE ".Interface.WPS"