From 2cf274c03eb93877f835113d8429b938495b9091 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 24 Jul 2015 18:54:13 +0200 Subject: [PATCH 1/9] core: order destruction of singleton instances Previously, the order of destructing singleton instances was undefined. Now, have singleton instances register their destruction via nm_singleton_instance_register(). Objects that are registered later, will be destructed earlier. IOW, they will be destroyed in reverse order of construction. This is only a crude method to get the lifetime of singleton instances right by default. Having singletons ref other singletons to keep them alive gives more control over the lifetimes of singletons. This change of having a defined order of destruction does not conflict with taking references to singletons (and thus extending their lifetime). Note that previously, NMPlatform was not registered for destruction. We don't change that yet and intenionally leak a reference. --- src/NetworkManagerUtils.c | 47 ++++++++++++++++++++++++++++++++++++++ src/NetworkManagerUtils.h | 24 ++++++------------- src/main.c | 6 +++++ src/nm-auth-manager.c | 5 ++-- src/nm-bus-manager.c | 5 ++-- src/nm-config.c | 5 ++-- src/platform/nm-platform.c | 4 ++-- 7 files changed, 68 insertions(+), 28 deletions(-) diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index c866c5f496..c9a7e13fed 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -112,6 +112,53 @@ _nm_utils_set_testing (NMUtilsTestFlags flags) } } +/*****************************************************************************/ + +static GSList *_singletons = NULL; +static gboolean _singletons_shutdown = FALSE; + +static void +_nm_singleton_instance_weak_cb (gpointer data, + GObject *where_the_object_was) +{ + _singletons = g_slist_remove (_singletons, where_the_object_was); +} + +static void __attribute__((destructor)) +_nm_singleton_instance_destroy (void) +{ + _singletons_shutdown = TRUE; + + while (_singletons) { + GObject *instance = _singletons->data; + + _singletons = g_slist_delete_link (_singletons, _singletons); + + g_object_weak_unref (instance, _nm_singleton_instance_weak_cb, NULL); + + if (instance->ref_count > 1) + nm_log_dbg (LOGD_CORE, "disown %s singleton (%p). There are more references and the instance might leak", G_OBJECT_TYPE_NAME (instance), instance); + + g_object_unref (instance); + } +} + +void +_nm_singleton_instance_register_destruction (GObject *instance) +{ + g_return_if_fail (G_IS_OBJECT (instance)); + + /* Don't allow registration after shutdown. We only destroy the singletons + * once. */ + g_return_if_fail (!_singletons_shutdown); + + g_object_weak_ref (instance, _nm_singleton_instance_weak_cb, NULL); + + _singletons = g_slist_prepend (_singletons, instance); +} + +/*****************************************************************************/ + /* * nm_ethernet_address_is_valid: * @addr: pointer to a binary or ASCII Ethernet address diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 5cc34cdf69..118534b8b3 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -34,7 +34,7 @@ #define NM_DEFINE_SINGLETON_INSTANCE(TYPE) \ static TYPE *singleton_instance -#define NM_DEFINE_SINGLETON_WEAK_REF(TYPE) \ +#define NM_DEFINE_SINGLETON_REGISTER(TYPE) \ NM_DEFINE_SINGLETON_INSTANCE (TYPE); \ static void \ _singleton_instance_weak_ref_cb (gpointer data, \ @@ -44,22 +44,13 @@ _singleton_instance_weak_ref_cb (gpointer data, \ singleton_instance = NULL; \ } \ static inline void \ -nm_singleton_instance_weak_ref_register (void) \ +nm_singleton_instance_register () \ { \ g_object_weak_ref (G_OBJECT (singleton_instance), _singleton_instance_weak_ref_cb, NULL); \ + _nm_singleton_instance_register_destruction (G_OBJECT (singleton_instance)); \ } -#define NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE) \ -NM_DEFINE_SINGLETON_INSTANCE (TYPE); \ -static void __attribute__((destructor)) \ -_singleton_destructor (void) \ -{ \ - if (singleton_instance) { \ - if (G_OBJECT (singleton_instance)->ref_count > 1) \ - nm_log_dbg (LOGD_CORE, "disown %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \ - g_object_unref (singleton_instance); \ - } \ -} +void _nm_singleton_instance_register_destruction (GObject *instance); /* By default, the getter will assert that the singleton will be created only once. You can * change this by redefining NM_DEFINE_SINGLETON_ALLOW_MULTIPLE. */ @@ -69,7 +60,7 @@ _singleton_destructor (void) \ #define NM_DEFINE_SINGLETON_GETTER(TYPE, GETTER, GTYPE, ...) \ NM_DEFINE_SINGLETON_INSTANCE (TYPE); \ -NM_DEFINE_SINGLETON_WEAK_REF (TYPE); \ +NM_DEFINE_SINGLETON_REGISTER (TYPE); \ TYPE * \ GETTER (void) \ { \ @@ -80,12 +71,11 @@ GETTER (void) \ _already_created = TRUE;\ singleton_instance = (g_object_new (GTYPE, ##__VA_ARGS__, NULL)); \ g_assert (singleton_instance); \ - nm_singleton_instance_weak_ref_register (); \ + nm_singleton_instance_register (); \ nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", G_STRINGIFY (TYPE), singleton_instance); \ } \ return singleton_instance; \ -} \ -NM_DEFINE_SINGLETON_DESTRUCTOR(TYPE) +} /*****************************************************************************/ diff --git a/src/main.c b/src/main.c index a0b6e37553..9f6ebdf3d2 100644 --- a/src/main.c +++ b/src/main.c @@ -440,6 +440,12 @@ main (int argc, char *argv[]) /* Set up platform interaction layer */ nm_linux_platform_setup (); + /* FIXME: intentionally leak the singleton instance of NMPlatform. + * nm_linux_platform_setup() will register the singleton for destruction, + * but we don't yet shut down all singletons properly, so don't destroy + * NMPlatform. */ + g_object_ref (NM_PLATFORM_GET); + nm_auth_manager_setup (nm_config_get_auth_polkit (config)); nm_dispatcher_init (); diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 9caca771f4..298bc096fe 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -78,8 +78,7 @@ typedef struct { #endif } NMAuthManagerPrivate; -NM_DEFINE_SINGLETON_DESTRUCTOR (NMAuthManager); -NM_DEFINE_SINGLETON_WEAK_REF (NMAuthManager); +NM_DEFINE_SINGLETON_REGISTER (NMAuthManager); G_DEFINE_TYPE (NMAuthManager, nm_auth_manager, G_TYPE_OBJECT) @@ -499,7 +498,7 @@ nm_auth_manager_setup (gboolean polkit_enabled) _LOGD ("set instance"); singleton_instance = self; - nm_singleton_instance_weak_ref_register (); + nm_singleton_instance_register (); return self; } diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index a600c225d4..e604746c18 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -78,8 +78,7 @@ static void nm_bus_manager_cleanup (NMBusManager *self, gboolean dispose); static void start_reconnection_timeout (NMBusManager *self); static void object_destroyed (NMBusManager *self, gpointer object); -NM_DEFINE_SINGLETON_DESTRUCTOR (NMBusManager); -NM_DEFINE_SINGLETON_WEAK_REF (NMBusManager); +NM_DEFINE_SINGLETON_REGISTER (NMBusManager); NMBusManager * nm_bus_manager_get (void) @@ -103,7 +102,7 @@ nm_bus_manager_setup (NMBusManager *instance) already_setup = TRUE; singleton_instance = instance; - nm_singleton_instance_weak_ref_register (); + nm_singleton_instance_register (); nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", "NMBusManager", singleton_instance); } diff --git a/src/nm-config.c b/src/nm-config.c index aa0e05a5d8..71ff69be57 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1671,8 +1671,7 @@ _set_config_data (NMConfig *self, NMConfigData *new_data, int signal) g_object_unref (old_data); } -NM_DEFINE_SINGLETON_DESTRUCTOR (NMConfig); -NM_DEFINE_SINGLETON_WEAK_REF (NMConfig); +NM_DEFINE_SINGLETON_REGISTER (NMConfig); NMConfig * nm_config_get (void) @@ -1688,7 +1687,7 @@ nm_config_setup (const NMConfigCmdLineOptions *cli, char **atomic_section_prefix singleton_instance = nm_config_new (cli, atomic_section_prefixes, error); if (singleton_instance) - nm_singleton_instance_weak_ref_register (); + nm_singleton_instance_register (); return singleton_instance; } diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 8803377a5b..6f54b22a74 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -112,7 +112,7 @@ typedef struct { /* Singleton NMPlatform subclass instance and cached class object */ NM_DEFINE_SINGLETON_INSTANCE (NMPlatform); -NM_DEFINE_SINGLETON_WEAK_REF (NMPlatform); +NM_DEFINE_SINGLETON_REGISTER (NMPlatform); /* Just always initialize a @klass instance. NM_PLATFORM_GET_CLASS() * is only a plain read on the self instance, which the compiler @@ -154,7 +154,7 @@ nm_platform_setup (NMPlatform *instance) singleton_instance = instance; - nm_singleton_instance_weak_ref_register (); + nm_singleton_instance_register (); nm_log_dbg (LOGD_CORE, "setup NMPlatform singleton (%p, %s)", instance, G_OBJECT_TYPE_NAME (instance)); } From cc16e9456214ab1fb0221599cac094786b5bef6a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 26 Jul 2015 11:48:05 +0200 Subject: [PATCH 2/9] core: log setup of singleton instances --- src/nm-auth-manager.c | 2 ++ src/nm-bus-manager.c | 2 +- src/nm-config.c | 7 ++++++- src/platform/nm-platform.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 298bc096fe..998ffb1ec7 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -500,6 +500,8 @@ nm_auth_manager_setup (gboolean polkit_enabled) singleton_instance = self; nm_singleton_instance_register (); + nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMAuthManager", singleton_instance); + return self; } diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index e604746c18..66c117ef21 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -103,7 +103,7 @@ nm_bus_manager_setup (NMBusManager *instance) already_setup = TRUE; singleton_instance = instance; nm_singleton_instance_register (); - nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", "NMBusManager", singleton_instance); + nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMBusManager", singleton_instance); } /**************************************************************/ diff --git a/src/nm-config.c b/src/nm-config.c index 71ff69be57..be04f163c6 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1686,8 +1686,13 @@ nm_config_setup (const NMConfigCmdLineOptions *cli, char **atomic_section_prefix g_assert (!singleton_instance); singleton_instance = nm_config_new (cli, atomic_section_prefixes, error); - if (singleton_instance) + if (singleton_instance) { nm_singleton_instance_register (); + + /* usually, you would not see this logging line because when creating the + * NMConfig instance, the logging is not yet set up to print debug message. */ + nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMConfig", singleton_instance); + } return singleton_instance; } diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 6f54b22a74..5e9f969737 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -156,7 +156,7 @@ nm_platform_setup (NMPlatform *instance) nm_singleton_instance_register (); - nm_log_dbg (LOGD_CORE, "setup NMPlatform singleton (%p, %s)", instance, G_OBJECT_TYPE_NAME (instance)); + nm_log_dbg (LOGD_CORE, "setup %s singleton (%p, %s)", "NMPlatform", singleton_instance, G_OBJECT_TYPE_NAME (instance)); } /** From 5ebea89252b375726c6c8d6b80e0245e83f0080d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Jul 2015 14:54:35 +0200 Subject: [PATCH 3/9] supplicant/test: fix wrong usage of nmtst_init() inside core tests --- src/supplicant-manager/tests/test-supplicant-config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index 937757b220..db4342fec7 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -36,6 +36,7 @@ #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" +#include "nm-logging.h" #include "nm-test-utils.h" @@ -443,7 +444,7 @@ NMTST_DEFINE (); int main (int argc, char **argv) { - nmtst_init (&argc, &argv, TRUE); + nmtst_init_assert_logging (&argc, &argv, "INFO", "DEFAULT"); g_test_add_func ("/supplicant-config/wifi-open", test_wifi_open); g_test_add_func ("/supplicant-config/wifi-wep", test_wifi_wep); From 37c9f62e5d19f7e6f086884649d453656fb59906 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Jul 2015 15:21:14 +0200 Subject: [PATCH 4/9] all: include internal headers with quotes --- src/devices/bluetooth/nm-bluez-common.h | 2 +- src/devices/bluetooth/nm-bluez-device.h | 2 +- src/devices/bluetooth/nm-device-bt.h | 2 +- src/nm-auth-subject.h | 2 +- src/nm-bus-manager.h | 2 +- src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 4 ++-- src/settings/plugins/ifnet/net_parser.c | 2 +- src/settings/plugins/ifnet/net_utils.c | 6 +++--- src/settings/plugins/ifnet/nm-ifnet-connection.c | 2 +- src/settings/plugins/ifnet/wpa_parser.c | 2 +- src/settings/plugins/ifupdown/nm-ifupdown-connection.c | 2 +- src/settings/plugins/keyfile/plugin.c | 4 ++-- src/systemd/nm-sd-adapt.h | 2 +- src/tests/config/nm-test-device.h | 2 +- src/tests/config/test-config.c | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/devices/bluetooth/nm-bluez-common.h b/src/devices/bluetooth/nm-bluez-common.h index f0cab43b34..4262fa766c 100644 --- a/src/devices/bluetooth/nm-bluez-common.h +++ b/src/devices/bluetooth/nm-bluez-common.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_BLUEZ_COMMON_H__ #define __NETWORKMANAGER_BLUEZ_COMMON_H__ -#include +#include "config.h" #define BLUETOOTH_CONNECT_DUN "dun" #define BLUETOOTH_CONNECT_NAP "nap" diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h index 5d89556082..01052c8d6f 100644 --- a/src/devices/bluetooth/nm-bluez-device.h +++ b/src/devices/bluetooth/nm-bluez-device.h @@ -22,7 +22,7 @@ #define __NETWORKMANAGER_BLUEZ_DEVICE_H__ -#include +#include "config.h" #include "nm-glib.h" #include "nm-connection.h" #include "nm-connection-provider.h" diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/devices/bluetooth/nm-device-bt.h index c1e95d915f..c565745ff3 100644 --- a/src/devices/bluetooth/nm-device-bt.h +++ b/src/devices/bluetooth/nm-device-bt.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DEVICE_BT_H__ #define __NETWORKMANAGER_DEVICE_BT_H__ -#include +#include "nm-device.h" #include "nm-bluez-device.h" #include "nm-modem.h" diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 6f4898692d..73013d8622 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_AUTH_SUBJECT_H__ #define __NETWORKMANAGER_AUTH_SUBJECT_H__ -#include +#include "config.h" #include #include diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 06b362d4e3..55919cf831 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -22,7 +22,7 @@ #ifndef __NM_BUS_MANAGER_H__ #define __NM_BUS_MANAGER_H__ -#include +#include "config.h" #include #include diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 277e9d7a20..026ce59565 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include "nm-platform.h" +#include "nm-logging.h" #include "common.h" #include "nm-config.h" diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c index 8f528d0f4d..637533517b 100644 --- a/src/settings/plugins/ifnet/net_parser.c +++ b/src/settings/plugins/ifnet/net_parser.c @@ -27,7 +27,7 @@ #include #include -#include +#include "nm-logging.h" #include "plugin.h" #include "nm-platform.h" diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index 332fdf5152..7d0f778b18 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -26,10 +26,10 @@ #include #include #include -#include +#include "NetworkManagerUtils.h" #include -#include -#include +#include "nm-logging.h" +#include "nm-config.h" #include "nm-glib.h" #include "net_utils.h" #include "wpa_parser.h" diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c index b31246408e..df1598ee5f 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include "nm-logging.h" #include "nm-ifnet-connection.h" #include "connection_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c index 3f912da876..5338e789f8 100644 --- a/src/settings/plugins/ifnet/wpa_parser.c +++ b/src/settings/plugins/ifnet/wpa_parser.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include "nm-logging.h" #include "wpa_parser.h" #include "net_parser.h" #include "net_utils.h" diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index c6073bd7e5..49c2328a09 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include "nm-logging.h" #include "nm-ifupdown-connection.h" #include "parser.h" diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index f34dc9fb3f..98c4fc513d 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include "nm-config.h" +#include "nm-logging.h" #include "nm-glib.h" #include "nm-core-internal.h" diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 2419fe64ee..10592fdbce 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -19,7 +19,7 @@ #ifndef NM_SD_ADAPT_H #define NM_SD_ADAPT_H -#include +#include "config.h" #include diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h index 00b21c426f..c3532c9cc0 100644 --- a/src/tests/config/nm-test-device.h +++ b/src/tests/config/nm-test-device.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_TEST_DEVICE_H__ #define __NETWORKMANAGER_TEST_DEVICE_H__ -#include +#include "nm-device.h" G_BEGIN_DECLS diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index 69e6894347..beb2a29115 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -23,7 +23,7 @@ #include -#include +#include "nm-config.h" #include "nm-glib.h" #include "nm-test-device.h" #include "nm-fake-platform.h" From 780e9a3f436b5bb347275e1951f45a487b153e11 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Jul 2015 15:45:10 +0200 Subject: [PATCH 5/9] libnm: include header in public header file with angle brackets --- libnm-core/nm-dbus-interface.h | 2 +- libnm-util/NetworkManager.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 0934add6fd..e46bef51f9 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -26,7 +26,7 @@ #ifndef __NM_DBUS_INTERFACE_H__ #define __NM_DBUS_INTERFACE_H__ -#include "nm-version.h" +#include /* * dbus services details diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h index 4fa861e88f..c55bd463cb 100644 --- a/libnm-util/NetworkManager.h +++ b/libnm-util/NetworkManager.h @@ -26,7 +26,7 @@ #ifndef NETWORK_MANAGER_H #define NETWORK_MANAGER_H -#include "nm-version.h" +#include /* * dbus services details From 9ac57182ca2a551f2c7dafa331b8daf74dc78e1c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Jul 2015 14:22:27 +0200 Subject: [PATCH 6/9] include: add convenience header "nm-default.h" This internal header file should be included by our internal source code files and header files. It includes in one place other headers that constitute to a minimal set of required headers. Most notably this is and our "nm-glib.h" header. Note that public header files and example source code cannot include this file as "nm-default.h" is internal only. --- include/Makefile.am | 1 + include/nm-default.h | 59 +++++++++++++++++++ src/Makefile.am | 2 +- src/devices/adsl/Makefile.am | 2 +- src/devices/bluetooth/Makefile.am | 2 +- src/devices/team/Makefile.am | 2 +- src/devices/wifi/Makefile.am | 2 +- src/devices/wifi/tests/Makefile.am | 2 +- src/devices/wwan/Makefile.am | 2 +- src/dhcp-manager/tests/Makefile.am | 2 +- src/dnsmasq-manager/tests/Makefile.am | 2 +- src/platform/tests/Makefile.am | 2 +- src/ppp-manager/Makefile.am | 2 +- src/rdisc/tests/Makefile.am | 2 +- src/settings/plugins/ibft/Makefile.am | 2 +- src/settings/plugins/ibft/tests/Makefile.am | 2 +- src/settings/plugins/ifcfg-rh/Makefile.am | 2 +- .../plugins/ifcfg-rh/tests/Makefile.am | 2 +- src/settings/plugins/ifnet/Makefile.am | 2 +- src/settings/plugins/ifnet/tests/Makefile.am | 2 +- src/settings/plugins/ifupdown/Makefile.am | 2 +- .../plugins/ifupdown/tests/Makefile.am | 2 +- src/settings/plugins/keyfile/Makefile.am | 2 +- .../plugins/keyfile/tests/Makefile.am | 2 +- src/supplicant-manager/tests/Makefile.am | 2 +- src/tests/Makefile.am | 2 +- src/tests/config/Makefile.am | 2 +- 27 files changed, 85 insertions(+), 25 deletions(-) create mode 100644 include/nm-default.h diff --git a/include/Makefile.am b/include/Makefile.am index 66b0bec801..b9b80cb024 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,6 +2,7 @@ EXTRA_DIST = \ gsystem-local-alloc.h \ nm-dbus-compat.h \ nm-dbus-glib-types.h \ + nm-default.h \ nm-glib.h \ nm-gvaluearray-compat.h \ nm-test-utils.h \ diff --git a/include/nm-default.h b/include/nm-default.h new file mode 100644 index 0000000000..6a2ccff268 --- /dev/null +++ b/include/nm-default.h @@ -0,0 +1,59 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ +/* NetworkManager -- Network link manager + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2015 Red Hat, Inc. + */ + +#ifndef __NM_DEFAULT_H__ +#define __NM_DEFAULT_H__ + +/* makefiles define NETWORKMANAGER_COMPILATION for compiling NetworkManager. + * Depending on which parts are compiled, different values are set. */ +#define NM_NETWORKMANAGER_COMPILATION_DEFAULT 0x0001 +#define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON 0x0002 + +#ifndef NETWORKMANAGER_COMPILATION +/* For convenience, we don't require our Makefile.am to define + * -DNETWORKMANAGER_COMPILATION. As we now include this internal header, + * we know we do a NETWORKMANAGER_COMPILATION. */ +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_DEFAULT +#endif + +/*****************************************************************************/ + +/* always include these headers for our internal source files. */ + +#include "nm-glib.h" +#include "nm-version.h" +#include "gsystem-local-alloc.h" + +/*****************************************************************************/ + +#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON + +/* the header is used inside src/, where additional + * headers are available. */ + +#include "nm-types.h" +#include "nm-logging.h" + +#endif /* NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON */ + +/*****************************************************************************/ + +#endif /* __NM_DEFAULT_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index a5d7973a77..10439446a0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,7 +38,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/callouts \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE # add each subdirectory that contains a libNM source file. $(sort) is being used diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am index 07a8f9eeb9..5454f9db5e 100644 --- a/src/devices/adsl/Makefile.am +++ b/src/devices/adsl/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GUDEV_CFLAGS) diff --git a/src/devices/bluetooth/Makefile.am b/src/devices/bluetooth/Makefile.am index 8ab561acf2..3f92aedfe2 100644 --- a/src/devices/bluetooth/Makefile.am +++ b/src/devices/bluetooth/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am index 6fea9b3f90..a30e953d79 100644 --- a/src/devices/team/Makefile.am +++ b/src/devices/team/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-team"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am index 1be3eb014d..cf4bb23a59 100644 --- a/src/devices/wifi/Makefile.am +++ b/src/devices/wifi/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am index 2a7d784970..4cac07e8c0 100644 --- a/src/devices/wifi/tests/Makefile.am +++ b/src/devices/wifi/tests/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/devices/wifi \ -I$(top_builddir)/src \ -DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \ - -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/devices/wwan/Makefile.am b/src/devices/wwan/Makefile.am index 7e5b190bf3..b382c2efa3 100644 --- a/src/devices/wwan/Makefile.am +++ b/src/devices/wwan/Makefile.am @@ -12,7 +12,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${top_srcdir}/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(MM_GLIB_CFLAGS) diff --git a/src/dhcp-manager/tests/Makefile.am b/src/dhcp-manager/tests/Makefile.am index 206974ba42..8fec6972c2 100644 --- a/src/dhcp-manager/tests/Makefile.am +++ b/src/dhcp-manager/tests/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/platform \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -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/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am index b51de6aa5d..fec3385954 100644 --- a/src/dnsmasq-manager/tests/Makefile.am +++ b/src/dnsmasq-manager/tests/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/platform \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DTESTDIR="\"$(abs_srcdir)\"" diff --git a/src/platform/tests/Makefile.am b/src/platform/tests/Makefile.am index 54844ec14a..983fb796f4 100644 --- a/src/platform/tests/Makefile.am +++ b/src/platform/tests/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${srcdir}/.. \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index fd2fe76bd8..15a738c921 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/libnm-core \ -I${top_builddir}/libnm-core \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) diff --git a/src/rdisc/tests/Makefile.am b/src/rdisc/tests/Makefile.am index 5d6f8b5bcb..12e047b39c 100644 --- a/src/rdisc/tests/Makefile.am +++ b/src/rdisc/tests/Makefile.am @@ -7,7 +7,7 @@ AM_CPPFLAGS = \ -I${top_builddir}/libnm-core \ -I${srcdir}/.. \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(LIBNDP_CFLAGS) diff --git a/src/settings/plugins/ibft/Makefile.am b/src/settings/plugins/ibft/Makefile.am index 00a5d175f0..d34ee6eab9 100644 --- a/src/settings/plugins/ibft/Makefile.am +++ b/src/settings/plugins/ibft/Makefile.am @@ -17,7 +17,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ - -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/ibft/tests/Makefile.am b/src/settings/plugins/ibft/tests/Makefile.am index 3c7c94accd..083c66568e 100644 --- a/src/settings/plugins/ibft/tests/Makefile.am +++ b/src/settings/plugins/ibft/tests/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ -DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_IBFT_DIR=\"$(abs_srcdir)\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am index 4989f4ba77..7546538e36 100644 --- a/src/settings/plugins/ifcfg-rh/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ - -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/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am index a3f6a05204..505601434b 100644 --- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am @@ -15,7 +15,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ -DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \ diff --git a/src/settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am index e2dec3b6f6..f9a5a4d53c 100644 --- a/src/settings/plugins/ifnet/Makefile.am +++ b/src/settings/plugins/ifnet/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ - -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/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am index afb215bac8..359894e32e 100644 --- a/src/settings/plugins/ifnet/tests/Makefile.am +++ b/src/settings/plugins/ifnet/tests/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/src/settings \ -I$(top_srcdir)/src/platform \ -DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(CHECK_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am index a67b96bd27..bec8de06c4 100644 --- a/src/settings/plugins/ifupdown/Makefile.am +++ b/src/settings/plugins/ifupdown/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ - -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/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am index 2e927db931..4d404d9224 100644 --- a/src/settings/plugins/ifupdown/tests/Makefile.am +++ b/src/settings/plugins/ifupdown/tests/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/settings \ -I$(srcdir)/../ \ -DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ -DTEST_ENI_DIR=\"$(abs_srcdir)\" 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/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/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am index 85268dcff9..032d97071b 100644 --- a/src/supplicant-manager/tests/Makefile.am +++ b/src/supplicant-manager/tests/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/supplicant-manager \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -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/tests/Makefile.am b/src/tests/Makefile.am index 83632bd198..c008385f1c 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -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/tests/config/Makefile.am b/src/tests/config/Makefile.am index 39e5a7f90a..a8e2905c80 100644 --- a/src/tests/config/Makefile.am +++ b/src/tests/config/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/devices \ -I${top_srcdir}/src/platform \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ From 19c3ea948a7c74774621baf62d68cb4826e1b97c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 17 Jul 2015 14:38:54 +0200 Subject: [PATCH 7/9] all: make use of new header file "nm-default.h" --- callouts/nm-dispatcher-utils.c | 2 +- callouts/nm-dispatcher-utils.h | 2 +- callouts/nm-dispatcher.c | 2 +- callouts/tests/test-dispatcher-envp.c | 2 +- clients/cli/agent.c | 2 +- clients/cli/common.c | 2 +- clients/cli/connections.c | 3 +-- clients/cli/devices.c | 2 +- clients/cli/general.c | 2 +- clients/cli/nmcli.c | 2 +- clients/cli/polkit-agent.c | 4 ++-- clients/cli/settings.c | 2 +- clients/cli/utils.c | 2 +- clients/common/nm-polkit-listener.c | 2 +- clients/common/nm-polkit-listener.h | 2 +- clients/common/nm-secret-agent-simple.c | 1 + clients/nm-online.c | 2 +- clients/tui/newt/Makefile.am | 1 + clients/tui/newt/nmt-newt-types.h | 2 +- clients/tui/newt/nmt-newt-utils.c | 2 +- clients/tui/newt/nmt-newt-utils.h | 2 +- clients/tui/nm-editor-utils.c | 1 + clients/tui/nmt-editor.c | 2 +- clients/tui/nmt-mac-entry.h | 2 +- clients/tui/nmt-page-bond.c | 2 +- clients/tui/nmt-page-bridge-port.c | 2 +- clients/tui/nmt-page-bridge.c | 2 +- clients/tui/nmt-page-dsl.c | 2 +- clients/tui/nmt-page-dsl.h | 2 +- clients/tui/nmt-page-ethernet.c | 2 +- clients/tui/nmt-page-infiniband.c | 2 +- clients/tui/nmt-page-ip4.c | 2 +- clients/tui/nmt-page-ip6.c | 2 +- clients/tui/nmt-page-ppp.c | 2 +- clients/tui/nmt-page-team-port.c | 2 +- clients/tui/nmt-page-team.c | 2 +- clients/tui/nmt-page-team.h | 2 +- clients/tui/nmt-page-vlan.c | 2 +- clients/tui/nmt-page-wifi.c | 2 +- clients/tui/nmt-route-editor.c | 2 +- clients/tui/nmt-utils.h | 2 +- clients/tui/nmtui.c | 2 +- clients/tui/vpn-helpers.c | 2 +- clients/tui/vpn-helpers.h | 2 +- include/nm-macros-internal.h | 2 +- include/nm-test-utils.h | 3 +-- libnm-core/crypto.c | 2 +- libnm-core/crypto.h | 2 +- libnm-core/crypto_gnutls.c | 2 +- libnm-core/crypto_nss.c | 2 +- libnm-core/nm-connection.c | 3 +-- libnm-core/nm-core-internal.h | 3 +-- libnm-core/nm-dbus-utils.c | 2 +- libnm-core/nm-errors.c | 2 +- libnm-core/nm-keyfile-internal.h | 2 +- libnm-core/nm-keyfile-reader.c | 3 +-- libnm-core/nm-keyfile-utils.c | 3 +-- libnm-core/nm-keyfile-writer.c | 3 +-- libnm-core/nm-property-compare.c | 2 +- libnm-core/nm-property-compare.h | 2 +- libnm-core/nm-setting-8021x.c | 2 +- libnm-core/nm-setting-ip-config.c | 2 +- libnm-core/nm-setting-private.h | 2 +- libnm-core/nm-setting-serial.c | 2 +- libnm-core/nm-setting.c | 2 +- libnm-core/nm-utils.c | 3 +-- libnm-core/tests/test-compare.c | 2 +- libnm-core/tests/test-crypto.c | 2 +- libnm-core/tests/test-general.c | 3 +-- libnm-core/tests/test-secrets.c | 2 +- libnm-core/tests/test-setting-8021x.c | 2 +- libnm-core/tests/test-setting-dcb.c | 2 +- libnm-core/tests/test-settings-defaults.c | 2 +- libnm-glib/libnm-glib-test.c | 2 +- libnm-glib/libnm_glib.c | 2 +- libnm-glib/nm-access-point.c | 2 +- libnm-glib/nm-active-connection.c | 2 +- libnm-glib/nm-client.c | 2 +- libnm-glib/nm-dbus-helpers-private.h | 2 +- libnm-glib/nm-dbus-helpers.c | 2 +- libnm-glib/nm-device-bond.c | 2 +- libnm-glib/nm-device-bridge.c | 2 +- libnm-glib/nm-device-bt.c | 2 +- libnm-glib/nm-device-ethernet.c | 2 +- libnm-glib/nm-device-infiniband.c | 2 +- libnm-glib/nm-device-modem.c | 2 +- libnm-glib/nm-device-olpc-mesh.c | 2 +- libnm-glib/nm-device-team.c | 2 +- libnm-glib/nm-device-vlan.c | 2 +- libnm-glib/nm-device-wifi.c | 2 +- libnm-glib/nm-device-wimax.c | 2 +- libnm-glib/nm-device.c | 2 +- libnm-glib/nm-object-cache.c | 2 +- libnm-glib/nm-object-cache.h | 2 +- libnm-glib/nm-object-private.h | 2 +- libnm-glib/nm-object.c | 2 +- libnm-glib/nm-remote-connection.c | 2 +- libnm-glib/nm-remote-settings.c | 2 +- libnm-glib/nm-secret-agent.c | 2 +- libnm-glib/nm-types.c | 2 +- libnm-glib/nm-vpn-plugin.c | 2 +- libnm-glib/nm-wimax-nsp.c | 2 +- libnm-glib/tests/common.c | 2 +- libnm-glib/tests/common.h | 2 +- libnm-glib/tests/test-nm-client.c | 2 +- libnm-glib/tests/test-remote-settings-client.c | 2 +- libnm-util/crypto.c | 2 +- libnm-util/crypto.h | 2 +- libnm-util/crypto_gnutls.c | 2 +- libnm-util/crypto_nss.c | 2 +- libnm-util/nm-connection.c | 2 +- libnm-util/nm-param-spec-specialized.c | 2 +- libnm-util/nm-param-spec-specialized.h | 2 +- libnm-util/nm-setting-ip4-config.c | 2 +- libnm-util/nm-setting-ip6-config.c | 2 +- libnm-util/nm-setting-private.h | 2 +- libnm-util/nm-setting-serial.c | 2 +- libnm-util/nm-utils.c | 2 +- libnm-util/nm-value-transforms.c | 2 +- libnm-util/tests/test-crypto.c | 2 +- libnm-util/tests/test-general.c | 3 +-- libnm-util/tests/test-libnm-linking.c | 2 +- libnm-util/tests/test-secrets.c | 2 +- libnm-util/tests/test-setting-8021x.c | 2 +- libnm-util/tests/test-setting-dcb.c | 3 +-- libnm-util/tests/test-settings-defaults.c | 2 +- libnm/nm-access-point.c | 2 +- libnm/nm-active-connection.c | 2 +- libnm/nm-client.c | 2 +- libnm/nm-dbus-helpers.c | 2 +- libnm/nm-dbus-helpers.h | 2 +- libnm/nm-device-bond.c | 2 +- libnm/nm-device-bridge.c | 2 +- libnm/nm-device-bt.c | 2 +- libnm/nm-device-ethernet.c | 2 +- libnm/nm-device-infiniband.c | 2 +- libnm/nm-device-modem.c | 2 +- libnm/nm-device-olpc-mesh.c | 2 +- libnm/nm-device-team.c | 2 +- libnm/nm-device-vlan.c | 2 +- libnm/nm-device-wifi.c | 2 +- libnm/nm-device-wimax.c | 2 +- libnm/nm-device.c | 2 +- libnm/nm-manager.c | 2 +- libnm/nm-object-cache.c | 2 +- libnm/nm-object-cache.h | 2 +- libnm/nm-object-private.h | 2 +- libnm/nm-object.c | 2 +- libnm/nm-remote-connection.c | 2 +- libnm/nm-remote-settings.c | 2 +- libnm/nm-secret-agent-old.c | 2 +- libnm/nm-vpn-plugin-old.c | 2 +- libnm/nm-wimax-nsp.c | 2 +- libnm/tests/common.c | 2 +- libnm/tests/common.h | 2 +- libnm/tests/test-nm-client.c | 2 +- libnm/tests/test-remote-settings-client.c | 2 +- libnm/tests/test-secret-agent.c | 2 +- src/Makefile.am | 4 +++- src/NetworkManagerUtils.c | 4 +--- src/NetworkManagerUtils.h | 3 +-- src/devices/adsl/nm-atm-manager.c | 3 +-- src/devices/adsl/nm-atm-manager.h | 2 +- src/devices/adsl/nm-device-adsl.c | 3 +-- src/devices/adsl/nm-device-adsl.h | 2 +- src/devices/bluetooth/nm-bluez-device.c | 3 +-- src/devices/bluetooth/nm-bluez-device.h | 2 +- src/devices/bluetooth/nm-bluez-manager.c | 3 +-- src/devices/bluetooth/nm-bluez-manager.h | 2 +- src/devices/bluetooth/nm-bluez4-adapter.c | 3 +-- src/devices/bluetooth/nm-bluez4-adapter.h | 2 +- src/devices/bluetooth/nm-bluez4-manager.c | 2 +- src/devices/bluetooth/nm-bluez4-manager.h | 2 +- src/devices/bluetooth/nm-bluez5-dun.c | 2 +- src/devices/bluetooth/nm-bluez5-dun.h | 2 +- src/devices/bluetooth/nm-bluez5-manager.c | 3 +-- src/devices/bluetooth/nm-bluez5-manager.h | 2 +- src/devices/bluetooth/nm-bt-error.c | 2 +- src/devices/bluetooth/nm-device-bt.c | 3 +-- src/devices/nm-device-bond.c | 4 +--- src/devices/nm-device-bridge.c | 4 +--- src/devices/nm-device-bridge.h | 2 +- src/devices/nm-device-ethernet-utils.c | 2 +- src/devices/nm-device-ethernet-utils.h | 2 +- src/devices/nm-device-ethernet.c | 4 +--- src/devices/nm-device-factory.c | 2 +- src/devices/nm-device-gre.c | 2 +- src/devices/nm-device-infiniband.c | 3 +-- src/devices/nm-device-logging.h | 2 +- src/devices/nm-device-macvlan.c | 2 +- src/devices/nm-device-private.h | 2 +- src/devices/nm-device-tun.c | 2 +- src/devices/nm-device-veth.c | 2 +- src/devices/nm-device-vlan.c | 4 +--- src/devices/nm-device-vxlan.c | 2 +- src/devices/nm-device.c | 4 +--- src/devices/nm-device.h | 2 +- src/devices/team/nm-device-team.c | 4 +--- src/devices/team/nm-team-factory.c | 2 +- src/devices/team/nm-team-factory.h | 2 +- src/devices/wifi/nm-device-olpc-mesh.c | 3 +-- src/devices/wifi/nm-device-wifi.c | 4 +--- src/devices/wifi/nm-wifi-ap-utils.c | 1 + src/devices/wifi/nm-wifi-ap.c | 4 +--- src/devices/wifi/tests/test-wifi-ap-utils.c | 3 +-- src/devices/wwan/nm-device-modem.c | 3 +-- src/devices/wwan/nm-modem-broadband.c | 2 +- src/devices/wwan/nm-modem-manager.c | 2 +- src/devices/wwan/nm-modem.c | 2 +- src/devices/wwan/nm-modem.h | 2 +- src/devices/wwan/nm-wwan-factory.c | 2 +- src/devices/wwan/nm-wwan-factory.h | 2 +- src/dhcp-manager/Makefile.am | 1 + src/dhcp-manager/nm-dhcp-client.c | 3 +-- src/dhcp-manager/nm-dhcp-client.h | 2 +- src/dhcp-manager/nm-dhcp-dhclient-utils.c | 3 +-- src/dhcp-manager/nm-dhcp-dhclient-utils.h | 2 +- src/dhcp-manager/nm-dhcp-dhclient.c | 4 +--- src/dhcp-manager/nm-dhcp-dhclient.h | 2 +- src/dhcp-manager/nm-dhcp-dhcpcd.c | 3 +-- src/dhcp-manager/nm-dhcp-helper.c | 2 +- src/dhcp-manager/nm-dhcp-listener.c | 3 +-- src/dhcp-manager/nm-dhcp-listener.h | 2 +- src/dhcp-manager/nm-dhcp-manager.c | 3 +-- src/dhcp-manager/nm-dhcp-manager.h | 2 +- src/dhcp-manager/nm-dhcp-systemd.c | 4 +--- src/dhcp-manager/nm-dhcp-utils.c | 3 +-- src/dhcp-manager/nm-dhcp-utils.h | 2 +- src/dhcp-manager/tests/test-dhcp-dhclient.c | 4 +--- src/dhcp-manager/tests/test-dhcp-utils.c | 3 +-- src/dns-manager/nm-dns-dnsmasq.c | 3 +-- src/dns-manager/nm-dns-manager.c | 3 +-- src/dns-manager/nm-dns-manager.h | 2 +- src/dns-manager/nm-dns-plugin.c | 3 +-- src/dns-manager/nm-dns-plugin.h | 2 +- src/dnsmasq-manager/nm-dnsmasq-manager.c | 3 +-- src/dnsmasq-manager/nm-dnsmasq-manager.h | 2 +- src/dnsmasq-manager/nm-dnsmasq-utils.h | 2 +- src/dnsmasq-manager/tests/test-dnsmasq-utils.c | 3 +-- src/main-utils.c | 4 +--- src/main-utils.h | 2 +- src/main.c | 4 +--- src/nm-activation-request.c | 3 +-- src/nm-activation-request.h | 3 +-- src/nm-active-connection.c | 5 +---- src/nm-auth-manager.c | 2 +- src/nm-auth-manager.h | 2 +- src/nm-auth-subject.c | 3 +-- src/nm-auth-subject.h | 3 +-- src/nm-auth-utils.c | 4 +--- src/nm-auth-utils.h | 3 +-- src/nm-bus-manager.c | 3 +-- src/nm-bus-manager.h | 3 +-- src/nm-config-data.c | 3 +-- src/nm-config-data.h | 3 +-- src/nm-config.c | 4 +--- src/nm-config.h | 3 +-- src/nm-connection-provider.h | 3 +-- src/nm-connectivity.c | 3 +-- src/nm-connectivity.h | 3 +-- src/nm-dcb.c | 3 +-- src/nm-dcb.h | 2 +- src/nm-default-route-manager.c | 2 +- src/nm-default-route-manager.h | 3 +-- src/nm-dhcp4-config.c | 2 +- src/nm-dhcp6-config.c | 2 +- src/nm-dispatcher.c | 3 +-- src/nm-dispatcher.h | 3 +-- src/nm-exported-object.c | 2 +- src/nm-exported-object.h | 3 +-- src/nm-firewall-manager.c | 4 +--- src/nm-firewall-manager.h | 2 +- src/nm-iface-helper.c | 4 +--- src/nm-ip4-config.c | 2 +- src/nm-ip6-config.c | 2 +- src/nm-logging.c | 4 +--- src/nm-logging.h | 3 ++- src/nm-manager.c | 4 +--- src/nm-multi-index.c | 2 +- src/nm-multi-index.h | 2 +- src/nm-policy.c | 3 +-- src/nm-policy.h | 2 +- src/nm-rfkill-manager.c | 2 +- src/nm-rfkill-manager.h | 3 +-- src/nm-route-manager.c | 3 +-- src/nm-route-manager.h | 3 +-- src/nm-session-monitor.c | 3 +-- src/nm-session-monitor.h | 3 +-- src/nm-sleep-monitor-systemd.c | 3 +-- src/nm-sleep-monitor-upower.c | 3 +-- src/nm-sleep-monitor.h | 3 +-- src/platform/nm-fake-platform.c | 3 +-- src/platform/nm-linux-platform.c | 3 +-- src/platform/nm-platform-utils.c | 3 +-- src/platform/nm-platform.c | 3 +-- src/platform/nm-platform.h | 3 +-- src/platform/nmp-object.c | 2 +- src/platform/tests/monitor.c | 3 +-- src/platform/tests/platform.c | 2 +- src/platform/tests/test-common.h | 2 +- src/platform/tests/test-general.c | 2 +- src/platform/tests/test-nmp-object.c | 2 +- src/platform/wifi/wifi-utils-nl80211.c | 3 +-- src/platform/wifi/wifi-utils-private.h | 2 +- src/platform/wifi/wifi-utils-wext.c | 3 +-- src/platform/wifi/wifi-utils.c | 2 +- src/platform/wifi/wifi-utils.h | 2 +- src/ppp-manager/Makefile.am | 1 + src/ppp-manager/nm-ppp-manager.c | 3 +-- src/ppp-manager/nm-pppd-plugin.c | 2 +- src/rdisc/nm-fake-rdisc.c | 2 +- src/rdisc/nm-lndp-rdisc.c | 2 +- src/rdisc/nm-rdisc.c | 2 +- src/rdisc/nm-rdisc.h | 2 +- src/rdisc/tests/test-rdisc-fake.c | 2 +- src/rdisc/tests/test-rdisc-linux.c | 2 +- src/settings/nm-agent-manager.c | 3 +-- src/settings/nm-inotify-helper.c | 3 +-- src/settings/nm-inotify-helper.h | 2 +- src/settings/nm-secret-agent.c | 3 +-- src/settings/nm-secret-agent.h | 3 +-- src/settings/nm-settings-connection.c | 4 +--- src/settings/nm-settings-connection.h | 2 +- src/settings/nm-settings.c | 3 +-- src/settings/nm-system-config-interface.h | 3 +-- src/settings/plugins/ibft/plugin.c | 3 +-- src/settings/plugins/ibft/plugin.h | 2 +- src/settings/plugins/ibft/reader.c | 3 +-- src/settings/plugins/ibft/reader.h | 2 +- src/settings/plugins/ibft/tests/test-ibft.c | 2 +- src/settings/plugins/ifcfg-rh/common.h | 2 +- src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c | 3 ++- src/settings/plugins/ifcfg-rh/plugin.c | 4 +--- src/settings/plugins/ifcfg-rh/reader.c | 4 +--- src/settings/plugins/ifcfg-rh/reader.h | 2 +- src/settings/plugins/ifcfg-rh/shvar.c | 3 +-- src/settings/plugins/ifcfg-rh/shvar.h | 2 +- src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 2 +- src/settings/plugins/ifcfg-rh/utils.c | 3 +-- src/settings/plugins/ifcfg-rh/utils.h | 3 +-- src/settings/plugins/ifcfg-rh/writer.c | 3 +-- src/settings/plugins/ifcfg-rh/writer.h | 2 +- src/settings/plugins/ifnet/connection_parser.c | 2 +- src/settings/plugins/ifnet/net_parser.c | 2 +- src/settings/plugins/ifnet/net_parser.h | 2 +- src/settings/plugins/ifnet/net_utils.c | 3 +-- src/settings/plugins/ifnet/net_utils.h | 2 +- src/settings/plugins/ifnet/nm-ifnet-connection.c | 2 +- src/settings/plugins/ifnet/plugin.c | 3 +-- src/settings/plugins/ifnet/plugin.h | 2 +- src/settings/plugins/ifnet/tests/test-ifnet.c | 3 +-- src/settings/plugins/ifnet/wpa_parser.c | 2 +- src/settings/plugins/ifnet/wpa_parser.h | 2 +- src/settings/plugins/ifupdown/interface_parser.c | 2 +- src/settings/plugins/ifupdown/interface_parser.h | 2 +- src/settings/plugins/ifupdown/nm-ifupdown-connection.c | 2 +- src/settings/plugins/ifupdown/nm-ifupdown-connection.h | 2 +- src/settings/plugins/ifupdown/parser.c | 2 +- src/settings/plugins/ifupdown/plugin.c | 3 +-- src/settings/plugins/ifupdown/plugin.h | 2 +- src/settings/plugins/ifupdown/tests/test-ifupdown.c | 4 +--- src/settings/plugins/keyfile/common.h | 2 +- src/settings/plugins/keyfile/nm-keyfile-connection.c | 2 +- src/settings/plugins/keyfile/plugin.c | 4 +--- src/settings/plugins/keyfile/plugin.h | 2 +- src/settings/plugins/keyfile/reader.c | 2 +- src/settings/plugins/keyfile/reader.h | 2 +- src/settings/plugins/keyfile/tests/test-keyfile.c | 2 +- src/settings/plugins/keyfile/utils.c | 3 +-- src/settings/plugins/keyfile/utils.h | 2 +- src/settings/plugins/keyfile/writer.c | 4 +--- src/settings/plugins/keyfile/writer.h | 2 +- src/supplicant-manager/nm-supplicant-config.c | 3 +-- src/supplicant-manager/nm-supplicant-config.h | 2 +- src/supplicant-manager/nm-supplicant-interface.c | 4 +--- src/supplicant-manager/nm-supplicant-interface.h | 2 +- src/supplicant-manager/nm-supplicant-manager.c | 3 +-- src/supplicant-manager/nm-supplicant-manager.h | 2 +- src/supplicant-manager/nm-supplicant-settings-verify.c | 2 +- src/supplicant-manager/tests/test-supplicant-config.c | 2 +- src/systemd/nm-sd-adapt.h | 2 +- src/tests/config/test-config.c | 3 +-- src/tests/test-dcb.c | 3 +-- src/tests/test-general-with-expect.c | 3 +-- src/tests/test-general.c | 3 +-- src/tests/test-ip4-config.c | 3 +-- src/tests/test-ip6-config.c | 3 +-- src/tests/test-resolvconf-capture.c | 3 +-- src/tests/test-route-manager.c | 3 +-- src/tests/test-wired-defname.c | 3 +-- src/vpn-manager/nm-vpn-connection.c | 4 +--- src/vpn-manager/nm-vpn-manager.c | 4 +--- src/vpn-manager/nm-vpn-manager.h | 2 +- src/vpn-manager/nm-vpn-service.c | 3 +-- src/vpn-manager/nm-vpn-service.h | 2 +- 395 files changed, 400 insertions(+), 551 deletions(-) diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c index b930e269f2..52eddfdab6 100644 --- a/callouts/nm-dispatcher-utils.c +++ b/callouts/nm-dispatcher-utils.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dispatcher-api.h" #include "nm-utils.h" diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h index be67787d6f..f68b3ea6ae 100644 --- a/callouts/nm-dispatcher-utils.h +++ b/callouts/nm-dispatcher-utils.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__ #define __NETWORKMANAGER_DISPATCHER_UTILS_H__ -#include "nm-glib.h" +#include "nm-default.h" char ** nm_dispatcher_utils_construct_envp (const char *action, diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c index ef6f2a96bd..32b60e8a29 100644 --- a/callouts/nm-dispatcher.c +++ b/callouts/nm-dispatcher.c @@ -34,7 +34,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dispatcher-api.h" #include "nm-dispatcher-utils.h" diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c index c6516b308e..faa6c085a0 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/callouts/tests/test-dispatcher-envp.c @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-dispatcher-utils.h" #include "nm-dispatcher-api.h" diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 896e76152a..75422ceae9 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "utils.h" #include "nm-secret-agent-simple.h" diff --git a/clients/cli/common.c b/clients/cli/common.c index db20372aeb..5a3f796424 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "utils.h" diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 36780577ea..372f6ad1c7 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -30,8 +30,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "utils.h" #include "common.h" #include "settings.h" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 70135e1780..940181384d 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -27,7 +27,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-secret-agent-simple.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index b5fd5e1f66..fa493bb849 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "polkit-agent.h" #include "utils.h" #include "general.h" diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 2c19e4897b..7ad5fa1b89 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -35,7 +35,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "polkit-agent.h" #include "nmcli.h" #include "utils.h" diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 269fa6df9e..1120b7eb7c 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -29,7 +29,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "polkit-agent.h" #include "nm-polkit-listener.h" #include "common.h" @@ -142,7 +142,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc) #else /* polkit agent is not avalable; implement stub functions. */ -#include "nm-glib.h" +#include "nm-default.h" #include "nmcli.h" #include "polkit-agent.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 42d88322e9..e5e6cd57cc 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "utils.h" #include "common.h" #include "settings.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 6552e15f63..cfc8cd2835 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -31,7 +31,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "utils.h" int diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index bad5f432dc..5726e6506d 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -38,7 +38,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-polkit-listener.h" G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER) diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h index ffdc91acf8..22c436c17c 100644 --- a/clients/common/nm-polkit-listener.h +++ b/clients/common/nm-polkit-listener.h @@ -22,7 +22,7 @@ #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE #include -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 8eddb4400e..00dc965e12 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -34,6 +34,7 @@ #include #include +#include "nm-default.h" #include "nm-secret-agent-simple.h" G_DEFINE_TYPE (NMSecretAgentSimple, nm_secret_agent_simple, NM_TYPE_SECRET_AGENT_OLD) diff --git a/clients/nm-online.c b/clients/nm-online.c index fc4e86474c..60e1a0a01b 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -42,7 +42,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #define PROGRESS_STEPS 15 #define WAIT_STARTUP_TAG "wait-startup" diff --git a/clients/tui/newt/Makefile.am b/clients/tui/newt/Makefile.am index e572238b2a..dcc02ab726 100644 --- a/clients/tui/newt/Makefile.am +++ b/clients/tui/newt/Makefile.am @@ -1,5 +1,6 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-core \ -DG_LOG_DOMAIN=\""nmtui"\" \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h index 775c3bc8ec..4ea0a7b8c7 100644 --- a/clients/tui/newt/nmt-newt-types.h +++ b/clients/tui/newt/nmt-newt-types.h @@ -21,7 +21,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index b405c9dbf9..b796219454 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -30,7 +30,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-newt-utils.h" static void diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h index 7a3b677f51..706f10d3e3 100644 --- a/clients/tui/newt/nmt-newt-utils.h +++ b/clients/tui/newt/nmt-newt-utils.h @@ -21,7 +21,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index f936c95943..8f15b734b5 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -30,6 +30,7 @@ #include #include +#include "nm-default.h" #include "nm-editor-utils.h" #if 0 #include "vpn-helpers.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index a0c15343f3..342da77d90 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmtui.h" #include "nm-editor-utils.h" diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h index 2852de8de1..099bacb71b 100644 --- a/clients/tui/nmt-mac-entry.h +++ b/clients/tui/nmt-mac-entry.h @@ -19,7 +19,7 @@ #ifndef NMT_MAC_ENTRY_H #define NMT_MAC_ENTRY_H -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nmt-newt.h" diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index 89e10cf539..ef7a79ae1d 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -29,7 +29,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-bond.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index ee18ba5fdd..c4238fff5c 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-bridge-port.h" G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index 84491b6a5f..042a650938 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-bridge.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 0b0f1b93e6..9916553d0b 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" #include "nmt-page-ppp.h" diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h index 8da0e05e91..dc84ca072c 100644 --- a/clients/tui/nmt-page-dsl.h +++ b/clients/tui/nmt-page-dsl.h @@ -19,7 +19,7 @@ #ifndef NMT_PAGE_DSL_H #define NMT_PAGE_DSL_H -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-editor-page-device.h" G_BEGIN_DECLS diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index cec0491a6d..433710186f 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-ethernet.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index ecc5dc311a..69ae2818ca 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 366a391973..5ec5736bbb 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -27,7 +27,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-ip4.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index ea8314d7f2..ea84af31c5 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -27,7 +27,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-ip6.h" #include "nmt-ip-entry.h" #include "nmt-address-list.h" diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index 85690e4e67..7c2d940a94 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -27,7 +27,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-ppp.h" #include "nmt-newt-section.h" #include "nmt-newt-separator.h" diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index a571924ae1..dfcaa15ed4 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-team-port.h" G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE) diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index b7664943fd..d153738ef5 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-team.h" #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h index 95a0e454d3..994b63d327 100644 --- a/clients/tui/nmt-page-team.h +++ b/clients/tui/nmt-page-team.h @@ -19,7 +19,7 @@ #ifndef NMT_PAGE_TEAM_H #define NMT_PAGE_TEAM_H -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-editor-page-device.h" G_BEGIN_DECLS diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index fefb244b15..637987c398 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-editor-bindings.h" #include "nmt-page-vlan.h" diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index cf593f0108..8a0c671639 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -31,7 +31,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-page-wifi.h" #include "nmt-mac-entry.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index 156f7ad085..875c2c99a4 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -29,7 +29,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h index cb7e632aae..5531dbeb62 100644 --- a/clients/tui/nmt-utils.h +++ b/clients/tui/nmt-utils.h @@ -19,7 +19,7 @@ #ifndef NMT_UTILS_H #define NMT_UTILS_H -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index 3519d5b9e0..d9e5142be7 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -34,7 +34,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nmt-newt.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c index 9cf8ce84c0..5ab22f4ef1 100644 --- a/clients/tui/vpn-helpers.c +++ b/clients/tui/vpn-helpers.c @@ -34,7 +34,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "vpn-helpers.h" #include "nm-macros-internal.h" diff --git a/clients/tui/vpn-helpers.h b/clients/tui/vpn-helpers.h index 4503b8178f..47fc27e39f 100644 --- a/clients/tui/vpn-helpers.h +++ b/clients/tui/vpn-helpers.h @@ -21,7 +21,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" GSList *vpn_get_plugins (void); diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h index 9d1beabb56..a98ced7606 100644 --- a/include/nm-macros-internal.h +++ b/include/nm-macros-internal.h @@ -22,7 +22,7 @@ #ifndef __NM_MACROS_INTERNAL_H__ #define __NM_MACROS_INTERNAL_H__ -#include "nm-glib.h" +#include "nm-default.h" /********************************************************/ diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h index 2c60e98f4b..a8f64b437f 100644 --- a/include/nm-test-utils.h +++ b/include/nm-test-utils.h @@ -89,10 +89,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" #ifdef __NETWORKMANAGER_LOGGING_H__ /* We are running tests under src/. Let's include some files by default. diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index c6b6653f92..77bc071ce8 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h index d4784102e6..c77ada5a7f 100644 --- a/libnm-core/crypto.h +++ b/libnm-core/crypto.h @@ -24,7 +24,7 @@ #ifndef __CRYPTO_H__ #define __CRYPTO_H__ -#include "nm-glib.h" +#include "nm-default.h" #define MD5_HASH_LEN 20 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC" diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c index 32692fde9e..6098b86ad1 100644 --- a/libnm-core/crypto_gnutls.c +++ b/libnm-core/crypto_gnutls.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c index 0c5905c18c..a1916a22c7 100644 --- a/libnm-core/crypto_nss.c +++ b/libnm-core/crypto_nss.c @@ -35,7 +35,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #include "nm-errors.h" diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 353421a70d..fd4b57305b 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -24,13 +24,12 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-connection-private.h" #include "nm-utils.h" #include "nm-setting-private.h" #include "nm-core-internal.h" -#include "gsystem-local-alloc.h" /** * SECTION:nm-connection diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 4081a32990..8028283ead 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -34,7 +34,7 @@ **/ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-core-enum-types.h" #include "nm-dbus-interface.h" @@ -67,7 +67,6 @@ #include "nm-setting.h" #include "nm-simple-connection.h" #include "nm-utils.h" -#include "nm-version.h" #include "nm-vpn-dbus-interface.h" #define NM_UTILS_CLEAR_CANCELLABLE(c) \ diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index e2e3265c52..6d75176e0e 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -23,7 +23,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" typedef struct { diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c index b2e95066d6..28e5ca2094 100644 --- a/libnm-core/nm-errors.c +++ b/libnm-core/nm-errors.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-errors.h" #include "nm-dbus-interface.h" #include "nm-vpn-dbus-interface.h" diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h index 5f4c927f29..7873aa7cdb 100644 --- a/libnm-core/nm-keyfile-internal.h +++ b/libnm-core/nm-keyfile-internal.h @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index dfc3944ccb..22141bd657 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -30,10 +30,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" #include "nm-keyfile-internal.h" #include "nm-keyfile-utils.h" diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c index 2540afebb1..15b14a3e07 100644 --- a/libnm-core/nm-keyfile-utils.c +++ b/libnm-core/nm-keyfile-utils.c @@ -23,8 +23,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-keyfile-utils.h" #include "nm-keyfile-internal.h" #include "nm-setting-wired.h" diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index 9dc9b387ed..a2270882e3 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting.h" #include "nm-setting-connection.h" #include "nm-setting-ip4-config.h" @@ -43,7 +43,6 @@ #include "nm-setting-8021x.h" #include "nm-utils.h" -#include "gsystem-local-alloc.h" #include "nm-keyfile-internal.h" #include "nm-keyfile-utils.h" diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c index a52c3ccee1..d244f74533 100644 --- a/libnm-core/nm-property-compare.c +++ b/libnm-core/nm-property-compare.c @@ -27,7 +27,7 @@ #include #include "nm-property-compare.h" -#include "nm-glib.h" +#include "nm-default.h" static gint _nm_property_compare_collection (GVariant *value1, GVariant *value2) diff --git a/libnm-core/nm-property-compare.h b/libnm-core/nm-property-compare.h index c03d147952..3f10581807 100644 --- a/libnm-core/nm-property-compare.h +++ b/libnm-core/nm-property-compare.h @@ -23,7 +23,7 @@ #ifndef __NM_PROPERTY_COMPARE_H__ #define __NM_PROPERTY_COMPARE_H__ -#include "nm-glib.h" +#include "nm-default.h" int nm_property_compare (GVariant *value1, GVariant *value2); diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 235be6af5b..21fa9a4986 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -25,6 +25,7 @@ #include #include +#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-utils.h" #include "crypto.h" @@ -32,7 +33,6 @@ #include "nm-setting-private.h" #include "nm-core-enum-types.h" #include "nm-macros-internal.h" -#include "gsystem-local-alloc.h" /** * SECTION:nm-setting-8021x diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index b4cd213817..6d4441d7a6 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-ip-config.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h index ea8194860a..aa90d9c73d 100644 --- a/libnm-core/nm-setting-private.h +++ b/libnm-core/nm-setting-private.h @@ -21,7 +21,7 @@ #ifndef __NM_SETTING_PRIVATE_H__ #define __NM_SETTING_PRIVATE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting.h" #include "nm-connection.h" #include "nm-core-enum-types.h" diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index 668565f35c..b8589cd28c 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-serial.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index 07daeacecb..f9dee4730d 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting.h" #include "nm-setting-private.h" #include "nm-utils.h" diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 0ed4814619..6b6a35d543 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -32,12 +32,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-setting-private.h" #include "crypto.h" -#include "gsystem-local-alloc.h" #include "nm-macros-internal.h" #include "nm-setting-bond.h" diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c index 6e861ffdb7..914330fe41 100644 --- a/libnm-core/tests/test-compare.c +++ b/libnm-core/tests/test-compare.c @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-property-compare.h" #include "nm-test-utils.h" diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index 282939f6e9..0d68653fc0 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" #include "nm-errors.h" diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index a033b9cbc2..063bda7dd3 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -26,8 +26,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-setting-private.h" #include "nm-utils.h" diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 6995522f79..4c0c7f5d37 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c index 255448b8bb..49d7448ea3 100644 --- a/libnm-core/tests/test-setting-8021x.c +++ b/libnm-core/tests/test-setting-8021x.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c index 2e9fa1a74d..f8b789c182 100644 --- a/libnm-core/tests/test-setting-dcb.c +++ b/libnm-core/tests/test-setting-dcb.c @@ -23,7 +23,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-dcb.h" #include "nm-connection.h" #include "nm-errors.h" diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c index 81d754223d..21e16f3d2e 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/libnm-core/tests/test-settings-defaults.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index c8ea9863a8..3b8f6cab14 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -31,7 +31,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-client.h" #include "nm-device.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 7e99db1c1c..09d9bea9b1 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -28,7 +28,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "libnm_glib.h" diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 5c6ba006a7..3a420ea14a 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-access-point.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 613c3577f1..539eb75f8e 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "nm-active-connection.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index e47a2751b1..a30b096ed3 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-client.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h index b2c992b6e7..c78bf1dae5 100644 --- a/libnm-glib/nm-dbus-helpers-private.h +++ b/libnm-glib/nm-dbus-helpers-private.h @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" DBusGConnection *_nm_dbus_new_connection (GError **error); diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c index 44ae13a804..db75eb24ea 100644 --- a/libnm-glib/nm-dbus-helpers.c +++ b/libnm-glib/nm-dbus-helpers.c @@ -23,7 +23,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-helpers-private.h" #include "NetworkManager.h" diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index b8a253cdf9..12df490f0e 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bond.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index f80835a85f..d08104d10b 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bridge.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 5b09399953..3d7d183b08 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index 24e3f36908..b591461636 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index 10b65aac79..b9af88794a 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-infiniband.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index 7ef2926b21..88c15dd798 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index f33c68e7fc..69acce4578 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index 6a16846bad..e7622962e4 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-team.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index 475be6be68..fe3db03a22 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 788e66954e..05b47b4da6 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-wifi.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index e94142031f..70c8b14e3c 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-wimax.h" #include "nm-object-private.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index b511254150..2363167168 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c index 09bf720cec..82af1140f1 100644 --- a/libnm-glib/nm-object-cache.c +++ b/libnm-glib/nm-object-cache.c @@ -21,7 +21,7 @@ #include "config.h" #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object-cache.h" #include "nm-object.h" diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h index 5fcd2ef574..30b62f08ce 100644 --- a/libnm-glib/nm-object-cache.h +++ b/libnm-glib/nm-object-cache.h @@ -21,7 +21,7 @@ #ifndef NM_OBJECT_CACHE_H #define NM_OBJECT_CACHE_H -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h index 519f6776b7..8878354f55 100644 --- a/libnm-glib/nm-object-private.h +++ b/libnm-glib/nm-object-private.h @@ -21,7 +21,7 @@ #ifndef NM_OBJECT_PRIVATE_H #define NM_OBJECT_PRIVATE_H -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object.h" void _nm_object_ensure_inited (NMObject *object); diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index b92b0ca61c..44ca947e40 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -25,7 +25,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "nm-object.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 1dce200e96..ce750ef3eb 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -27,7 +27,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index d2fa2db73e..421f70305a 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-glib-types.h" #include "nm-remote-settings.h" #include "nm-remote-connection-private.h" diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 32b8564f0f..99871ad2d9 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -23,7 +23,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "nm-secret-agent.h" #include "nm-glib-enum-types.h" diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index daafc2bc25..30936f4ee6 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -22,7 +22,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-types.h" #include "nm-types-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index 290ecb4738..6a728f9ebf 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -22,7 +22,7 @@ #include "config.h" #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-plugin.h" #include "nm-vpn-enum-types.h" #include "nm-utils.h" diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index e85fb4e370..1c40a2174f 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-wimax-nsp.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/tests/common.c b/libnm-glib/tests/common.c index 3989f756f1..f68c4b163e 100644 --- a/libnm-glib/tests/common.c +++ b/libnm-glib/tests/common.c @@ -23,7 +23,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "common.h" diff --git a/libnm-glib/tests/common.h b/libnm-glib/tests/common.h index 63dbe4d24f..5ffd955c49 100644 --- a/libnm-glib/tests/common.h +++ b/libnm-glib/tests/common.h @@ -18,7 +18,7 @@ * Copyright 2014 Red Hat, Inc. */ -#include "nm-glib.h" +#include "nm-default.h" typedef struct { GDBusConnection *bus; diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index 067d460c91..f3a581152a 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-client.h" #include "nm-device-wifi.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index b40a0facd9..831c1beef5 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -33,7 +33,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-remote-settings.h" #include "common.h" diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 8b6198c93b..fccf05d1a6 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" GQuark diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h index 36041584cf..74d1adbf6a 100644 --- a/libnm-util/crypto.h +++ b/libnm-util/crypto.h @@ -24,7 +24,7 @@ #ifndef __CRYPTO_H__ #define __CRYPTO_H__ -#include "nm-glib.h" +#include "nm-default.h" #define MD5_HASH_LEN 20 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC" diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index 8b0c9f78cc..1ff55e91b8 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #define SALT_LEN 8 diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index 9f60f5cc28..222c55d2dd 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -35,7 +35,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" static gboolean initialized = FALSE; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 2671ce3c78..0753fd1381 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -25,7 +25,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-utils.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index 456c341773..50903b067d 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -22,7 +22,7 @@ #include "config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-param-spec-specialized.h" struct _NMParamSpecSpecialized { diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h index 226c301758..0f1228f69b 100644 --- a/libnm-util/nm-param-spec-specialized.h +++ b/libnm-util/nm-param-spec-specialized.h @@ -23,7 +23,7 @@ #ifndef NM_PARAM_SPEC_SPECIALIZED_H #define NM_PARAM_SPEC_SPECIALIZED_H -#include "nm-glib.h" +#include "nm-default.h" typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized; diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 838a88e0d0..9c6a76bb06 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-ip4-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 8c8055c80f..1d91648348 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-ip6-config.h" #include "nm-param-spec-specialized.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h index 1b6c0377f3..6956463c3f 100644 --- a/libnm-util/nm-setting-private.h +++ b/libnm-util/nm-setting-private.h @@ -21,7 +21,7 @@ #ifndef NM_SETTING_PRIVATE_H #define NM_SETTING_PRIVATE_H -#include "nm-glib.h" +#include "nm-default.h" #define NM_SETTING_SECRET_FLAGS_ALL \ (NM_SETTING_SECRET_FLAG_NONE | \ diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index 9524881b01..c60cffb25e 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-serial.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 23c2cbf446..c4cc4cf212 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c index 6a6f5bfc0d..cc7bc50bfa 100644 --- a/libnm-util/nm-value-transforms.c +++ b/libnm-util/nm-value-transforms.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-utils-private.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index 290a722452..baf0cf45a8 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c index 598914d9f7..73c9dd8b5d 100644 --- a/libnm-util/tests/test-general.c +++ b/libnm-util/tests/test-general.c @@ -29,8 +29,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-setting-private.h" #include "nm-setting-connection.h" diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c index 66a4831410..a24498f823 100644 --- a/libnm-util/tests/test-libnm-linking.c +++ b/libnm-util/tests/test-libnm-linking.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" extern GType nm_state_get_type (void); diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c index cc23813119..f5423d10cc 100644 --- a/libnm-util/tests/test-secrets.c +++ b/libnm-util/tests/test-secrets.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-setting-8021x.h" diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c index 9790669869..ad48ac614d 100644 --- a/libnm-util/tests/test-setting-8021x.c +++ b/libnm-util/tests/test-setting-8021x.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c index 20a02250bf..26c4f0c6ac 100644 --- a/libnm-util/tests/test-setting-dcb.c +++ b/libnm-util/tests/test-setting-dcb.c @@ -23,9 +23,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-dcb.h" -#include "gsystem-local-alloc.h" #define DCB_FLAGS_ALL (NM_SETTING_DCB_FLAG_ENABLE | \ NM_SETTING_DCB_FLAG_ADVERTISE | \ diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c index 1f0ba1c294..09f112cf74 100644 --- a/libnm-util/tests/test-settings-defaults.c +++ b/libnm-util/tests/test-settings-defaults.c @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c index 95c2cf5f5d..bd05134891 100644 --- a/libnm/nm-access-point.c +++ b/libnm/nm-access-point.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-access-point.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index f2951fbef2..b16080278a 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-active-connection.h" #include "nm-object-private.h" diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 5ddb70bea4..85cf4ae25a 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-client.h" #include "nm-manager.h" #include "nm-remote-settings.h" diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c index 717f7f4602..5d876e0c6a 100644 --- a/libnm/nm-dbus-helpers.c +++ b/libnm/nm-dbus-helpers.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-helpers.h" #include "nm-dbus-interface.h" diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h index 2b0809f81b..497739f0ac 100644 --- a/libnm/nm-dbus-helpers.h +++ b/libnm/nm-dbus-helpers.h @@ -22,7 +22,7 @@ #define __NM_DBUS_HELPERS_PRIVATE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-compat.h" GBusType _nm_dbus_bus_type (void); diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 8959f1e0e2..f36b761f31 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bond.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 2b9efbd0d2..4ebcec3f56 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bridge.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index 01566312f9..1a0ecb98fa 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index 21bb52be5a..ac18d30ac7 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index e8436a9294..c59dd0f100 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-infiniband.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index 81d7570e2b..e62b10b5f4 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c index 32b40eb01c..1cf3c33ebd 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/libnm/nm-device-olpc-mesh.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 5fc09cdc05..540786cd96 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-team.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index d4992426a4..0b95450ad7 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index 94bb5d31ef..a6a717ffd6 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -29,7 +29,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-wifi.h" #include "nm-access-point.h" #include "nm-device-private.h" diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index 61406ff3c1..bc2337a9a6 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -28,7 +28,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-wimax.h" #include "nm-wimax-nsp.h" #include "nm-object-private.h" diff --git a/libnm/nm-device.c b/libnm/nm-device.c index ba9234de81..5a23fab292 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-active-connection.h" #include "nm-device-ethernet.h" diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 48e1d83d2b..25ab1f8a24 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-manager.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" diff --git a/libnm/nm-object-cache.c b/libnm/nm-object-cache.c index 09bf720cec..82af1140f1 100644 --- a/libnm/nm-object-cache.c +++ b/libnm/nm-object-cache.c @@ -21,7 +21,7 @@ #include "config.h" #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object-cache.h" #include "nm-object.h" diff --git a/libnm/nm-object-cache.h b/libnm/nm-object-cache.h index 5e5eead0ac..c0f70f21cc 100644 --- a/libnm/nm-object-cache.h +++ b/libnm/nm-object-cache.h @@ -21,7 +21,7 @@ #ifndef __NM_OBJECT_CACHE_H__ #define __NM_OBJECT_CACHE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object.h" G_BEGIN_DECLS diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h index f8fcee9986..7e8066f4ee 100644 --- a/libnm/nm-object-private.h +++ b/libnm/nm-object-private.h @@ -21,7 +21,7 @@ #ifndef __NM_OBJECT_PRIVATE_H__ #define __NM_OBJECT_PRIVATE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-object.h" typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer); diff --git a/libnm/nm-object.c b/libnm/nm-object.c index b86dc7d1ba..9d6bde9d4b 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -26,7 +26,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-object.h" #include "nm-object-cache.h" diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index a27c0404f0..83da4f9ec6 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -27,7 +27,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index d6a786a6ac..999859ccbd 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-remote-settings.h" #include "nm-client.h" #include "nm-remote-connection.h" diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 97f3bc8d59..97bb287e8c 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-secret-agent-old.h" #include "nm-enum-types.h" diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index ff7ce834a8..a98cd43625 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -27,7 +27,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-plugin-old.h" #include "nm-enum-types.h" #include "nm-utils.h" diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c index 3fa4ddf019..9fbc6ea1d3 100644 --- a/libnm/nm-wimax-nsp.c +++ b/libnm/nm-wimax-nsp.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-wimax-nsp.h" #include "nm-dbus-interface.h" #include "nm-object-private.h" diff --git a/libnm/tests/common.c b/libnm/tests/common.c index 833d7fd004..877488eeee 100644 --- a/libnm/tests/common.c +++ b/libnm/tests/common.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManager.h" #include "nm-dbus-compat.h" diff --git a/libnm/tests/common.h b/libnm/tests/common.h index 1fd3f464c6..4919d3fda1 100644 --- a/libnm/tests/common.h +++ b/libnm/tests/common.h @@ -20,7 +20,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" typedef struct { GDBusConnection *bus; diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c index 55b005066e..ccd952c96f 100644 --- a/libnm/tests/test-nm-client.c +++ b/libnm/tests/test-nm-client.c @@ -26,7 +26,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "nm-test-utils.h" diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c index 2f47b53267..66fbf2bfbc 100644 --- a/libnm/tests/test-remote-settings-client.c +++ b/libnm/tests/test-remote-settings-client.c @@ -26,7 +26,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "nm-test-utils.h" diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c index 28a6c9920d..ed2e2dcb50 100644 --- a/libnm/tests/test-secret-agent.c +++ b/libnm/tests/test-secret-agent.c @@ -27,7 +27,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "nm-test-utils.h" diff --git a/src/Makefile.am b/src/Makefile.am index 10439446a0..e92d9f7506 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,7 +59,9 @@ SYSTEMD_NM_CFLAGS = \ -I$(top_srcdir)/src/systemd/src/libsystemd-network \ -I$(top_srcdir)/src/systemd/src/basic \ -I$(top_srcdir)/src/systemd/src/shared \ - -I$(top_srcdir)/src/systemd + -I$(top_srcdir)/src/systemd \ + -I$(top_srcdir)/libnm-core \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON libsystemd_nm_la_SOURCES = \ systemd/src/libsystemd/sd-id128/sd-id128.c \ diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index c9a7e13fed..d8e5fed1bd 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -33,12 +33,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-platform.h" #include "nm-utils.h" #include "nm-core-internal.h" -#include "nm-logging.h" #include "nm-device.h" #include "nm-setting-connection.h" #include "nm-setting-ip4-config.h" @@ -47,7 +46,6 @@ #include "nm-setting-wireless-security.h" #include "nm-auth-utils.h" #include "nm-dbus-glib-types.h" -#include "gsystem-local-alloc.h" /* * Some toolchains (E.G. uClibc 0.9.33 and earlier) don't export diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 118534b8b3..6a8121718e 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -25,9 +25,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" -#include "nm-types.h" /*****************************************************************************/ diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index 1718cdd8dc..6a33d21b1e 100644 --- a/src/devices/adsl/nm-atm-manager.c +++ b/src/devices/adsl/nm-atm-manager.c @@ -24,12 +24,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-atm-manager.h" #include "nm-setting-adsl.h" #include "nm-device-adsl.h" #include "nm-device-factory.h" -#include "nm-logging.h" typedef struct { GUdevClient *client; diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h index 16dc332e14..fe0bc14c4e 100644 --- a/src/devices/adsl/nm-atm-manager.h +++ b/src/devices/adsl/nm-atm-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_ATM_MANAGER_H__ #define __NETWORKMANAGER_ATM_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index a557a0c88f..34390282d7 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -33,11 +33,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-adsl.h" #include "nm-device-private.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" #include "nm-enum-types.h" #include "nm-platform.h" diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h index 74e29d5dd1..3587bfc75f 100644 --- a/src/devices/adsl/nm-device-adsl.h +++ b/src/devices/adsl/nm-device-adsl.h @@ -23,7 +23,7 @@ #define __NETWORKMANAGER_DEVICE_ADSL_H__ // Parent class -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" G_BEGIN_DECLS diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index 39afd091a5..ba021797ea 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -24,13 +24,12 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-bt-error.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" -#include "nm-logging.h" #include "nm-settings-connection.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h index 01052c8d6f..0e54fcb067 100644 --- a/src/devices/bluetooth/nm-bluez-device.h +++ b/src/devices/bluetooth/nm-bluez-device.h @@ -23,7 +23,7 @@ #include "config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-connection-provider.h" diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c index ed424bd2f6..7550d4ed86 100644 --- a/src/devices/bluetooth/nm-bluez-manager.c +++ b/src/devices/bluetooth/nm-bluez-manager.c @@ -25,8 +25,7 @@ #include #include -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-device-factory.h" #include "nm-setting-bluetooth.h" diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/devices/bluetooth/nm-bluez-manager.h index 97b9ac66cf..1f5597d831 100644 --- a/src/devices/bluetooth/nm-bluez-manager.h +++ b/src/devices/bluetooth/nm-bluez-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_BLUEZ_MANAGER_H__ #define __NETWORKMANAGER_BLUEZ_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c index e02e72095c..04ae833ae9 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.c +++ b/src/devices/bluetooth/nm-bluez4-adapter.c @@ -22,12 +22,11 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bluez4-adapter.h" #include "nm-bluez-device.h" #include "nm-bluez-common.h" -#include "nm-logging.h" #include "nm-core-internal.h" G_DEFINE_TYPE (NMBluez4Adapter, nm_bluez4_adapter, G_TYPE_OBJECT) diff --git a/src/devices/bluetooth/nm-bluez4-adapter.h b/src/devices/bluetooth/nm-bluez4-adapter.h index 98d19b22ef..a8a2bfb4d2 100644 --- a/src/devices/bluetooth/nm-bluez4-adapter.h +++ b/src/devices/bluetooth/nm-bluez4-adapter.h @@ -22,7 +22,7 @@ #define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-bluez-device.h" #include "nm-connection-provider.h" diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c index 9df80bf158..c5ba120c6c 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.c +++ b/src/devices/bluetooth/nm-bluez4-manager.c @@ -25,7 +25,7 @@ #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez4-manager.h" #include "nm-bluez4-adapter.h" diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h index e5f526461b..f6bf76586b 100644 --- a/src/devices/bluetooth/nm-bluez4-manager.h +++ b/src/devices/bluetooth/nm-bluez4-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__ #define __NETWORKMANAGER_BLUEZ4_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection-provider.h" G_BEGIN_DECLS diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c index a97eaa770f..9ec6a089fc 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.c +++ b/src/devices/bluetooth/nm-bluez5-dun.c @@ -32,7 +32,7 @@ #include "nm-bluez5-dun.h" #include "nm-bt-error.h" -#include "nm-logging.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" struct _NMBluez5DunContext { diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/devices/bluetooth/nm-bluez5-dun.h index bc2f6c7aa2..c59cbb80f8 100644 --- a/src/devices/bluetooth/nm-bluez5-dun.h +++ b/src/devices/bluetooth/nm-bluez5-dun.h @@ -21,7 +21,7 @@ #ifndef _NM_BLUEZ5_UTILS_H_ #define _NM_BLUEZ5_UTILS_H_ -#include "nm-glib.h" +#include "nm-default.h" typedef struct _NMBluez5DunContext NMBluez5DunContext; diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c index ceb8d484d6..c9f5828dfb 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.c +++ b/src/devices/bluetooth/nm-bluez5-manager.c @@ -26,8 +26,7 @@ #include #include -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-bluez-manager.h" #include "nm-bluez5-manager.h" #include "nm-bluez-device.h" diff --git a/src/devices/bluetooth/nm-bluez5-manager.h b/src/devices/bluetooth/nm-bluez5-manager.h index faf6ce6692..ae5512f89e 100644 --- a/src/devices/bluetooth/nm-bluez5-manager.h +++ b/src/devices/bluetooth/nm-bluez5-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_BLUEZ5_MANAGER_H__ #define __NETWORKMANAGER_BLUEZ5_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection-provider.h" G_BEGIN_DECLS diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c index 11aabbdb57..9c35d8b63b 100644 --- a/src/devices/bluetooth/nm-bt-error.c +++ b/src/devices/bluetooth/nm-bt-error.c @@ -20,7 +20,7 @@ #include "config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-bt-error.h" GQuark diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index 55b8d0aef5..f0c94f8fd3 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -25,12 +25,11 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" #include "nm-device-bt.h" #include "nm-device-private.h" -#include "nm-logging.h" #include "ppp-manager/nm-ppp-manager.h" #include "nm-setting-connection.h" #include "nm-setting-bluetooth.h" diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index b352e513dd..822062ae12 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -25,10 +25,8 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-device-bond.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index b031a43e39..a1fbc60970 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -24,10 +24,8 @@ #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-device-bridge.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-dbus-glib-types.h" diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h index e30c48c2dc..1d0bf7ca0c 100644 --- a/src/devices/nm-device-bridge.h +++ b/src/devices/nm-device-bridge.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__ #define __NETWORKMANAGER_DEVICE_BRIDGE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" G_BEGIN_DECLS diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c index 7c226f065e..886edf4473 100644 --- a/src/devices/nm-device-ethernet-utils.c +++ b/src/devices/nm-device-ethernet-utils.c @@ -22,7 +22,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-ethernet-utils.h" char * diff --git a/src/devices/nm-device-ethernet-utils.h b/src/devices/nm-device-ethernet-utils.h index 1ca181b2b2..31d645d851 100644 --- a/src/devices/nm-device-ethernet-utils.h +++ b/src/devices/nm-device-ethernet-utils.h @@ -19,7 +19,7 @@ #ifndef __NETWORKMANAGER_DEVICE_ETHERNET_UTILS_H__ #define __NETWORKMANAGER_DEVICE_ETHERNET_UTILS_H__ -#include "nm-glib.h" +#include "nm-default.h" char *nm_device_ethernet_utils_get_default_wired_name (const GSList *connections); diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 6caea4974c..fc49fd1b69 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -30,7 +30,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-activation-request.h" @@ -39,7 +39,6 @@ #include "nm-supplicant-interface.h" #include "nm-supplicant-config.h" #include "ppp-manager/nm-ppp-manager.h" -#include "nm-logging.h" #include "nm-enum-types.h" #include "nm-platform.h" #include "nm-platform-utils.h" @@ -51,7 +50,6 @@ #include "nm-device-factory.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "nm-device-ethernet-glue.h" diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c index 7f2468bd0d..bf3f25c606 100644 --- a/src/devices/nm-device-factory.c +++ b/src/devices/nm-device-factory.c @@ -27,7 +27,7 @@ #include #include "nm-device-factory.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" const NMLinkType _nm_device_factory_no_default_links[] = { NM_LINK_TYPE_NONE }; diff --git a/src/devices/nm-device-gre.c b/src/devices/nm-device-gre.c index 47169897be..c26190ab56 100644 --- a/src/devices/nm-device-gre.c +++ b/src/devices/nm-device-gre.c @@ -25,7 +25,7 @@ #include "nm-device-gre.h" #include "nm-device-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index ce531655bc..a3fcd75418 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -24,9 +24,8 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-infiniband.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-enum-types.h" diff --git a/src/devices/nm-device-logging.h b/src/devices/nm-device-logging.h index acca32e556..7b8598d82f 100644 --- a/src/devices/nm-device-logging.h +++ b/src/devices/nm-device-logging.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__ #define __NETWORKMANAGER_DEVICE_LOGGING_H__ -#include "nm-logging.h" +#include "nm-default.h" #include "nm-device.h" #define _LOG_DECLARE_SELF(t) \ diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c index 51d75b5bc9..6f331571ca 100644 --- a/src/devices/nm-device-macvlan.c +++ b/src/devices/nm-device-macvlan.c @@ -24,7 +24,7 @@ #include "nm-device-macvlan.h" #include "nm-device-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-private.h b/src/devices/nm-device-private.h index c4e3fe0de3..33f51bfb6e 100644 --- a/src/devices/nm-device-private.h +++ b/src/devices/nm-device-private.h @@ -24,7 +24,7 @@ #include "nm-device.h" -#include "nm-logging.h" +#include "nm-default.h" /* This file should only be used by subclasses of NMDevice */ diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c index e2af6b279f..6c6ed52113 100644 --- a/src/devices/nm-device-tun.c +++ b/src/devices/nm-device-tun.c @@ -25,7 +25,7 @@ #include "nm-device-tun.h" #include "nm-device-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c index 1a3a65443d..c4666a217e 100644 --- a/src/devices/nm-device-veth.c +++ b/src/devices/nm-device-veth.c @@ -29,7 +29,7 @@ #include "nm-device-veth.h" #include "nm-device-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-device-factory.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index d89bf625b5..defa3b81a3 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -24,10 +24,9 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-manager.h" -#include "nm-logging.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" @@ -39,7 +38,6 @@ #include "nm-device-factory.h" #include "nm-manager.h" #include "nm-core-internal.h" -#include "gsystem-local-alloc.h" #include "nm-device-vlan-glue.h" diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c index 4f46f6aa8d..68dbd952a1 100644 --- a/src/devices/nm-device-vxlan.c +++ b/src/devices/nm-device-vxlan.c @@ -24,7 +24,7 @@ #include "nm-device-vxlan.h" #include "nm-device-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-manager.h" #include "nm-platform.h" #include "nm-utils.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 46d90cfa7e..c2c8690d53 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -35,8 +35,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-device.h" #include "nm-device-private.h" #include "NetworkManagerUtils.h" @@ -45,7 +44,6 @@ #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" #include "nm-dhcp-manager.h" -#include "nm-logging.h" #include "nm-activation-request.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h index 9e0dcac717..8c26d161fb 100644 --- a/src/devices/nm-device.h +++ b/src/devices/nm-device.h @@ -27,7 +27,7 @@ #include "nm-exported-object.h" #include "nm-dbus-interface.h" -#include "nm-types.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-rfkill-manager.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 145b854f69..5b5b760e00 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -28,9 +28,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-team.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" @@ -38,7 +37,6 @@ #include "nm-enum-types.h" #include "nm-team-enum-types.h" #include "nm-core-internal.h" -#include "gsystem-local-alloc.h" #include "nm-device-team-glue.h" diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c index 949e01d15d..8591782495 100644 --- a/src/devices/team/nm-team-factory.c +++ b/src/devices/team/nm-team-factory.c @@ -26,7 +26,7 @@ #include "nm-device-factory.h" #include "nm-team-factory.h" #include "nm-device-team.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/devices/team/nm-team-factory.h b/src/devices/team/nm-team-factory.h index 35cee90e1d..9049478dc1 100644 --- a/src/devices/team/nm-team-factory.h +++ b/src/devices/team/nm-team-factory.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_TEAM_FACTORY_H__ #define __NETWORKMANAGER_TEAM_FACTORY_H__ -#include "nm-glib.h" +#include "nm-default.h" #define NM_TYPE_TEAM_FACTORY (nm_team_factory_get_type ()) #define NM_TEAM_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEAM_FACTORY, NMTeamFactory)) diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index f7fffd272e..7e37a2cf81 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -37,13 +37,12 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-utils.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" #include "nm-setting-connection.h" diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index ed7a402463..42326d5192 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -28,13 +28,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" #include "nm-device-wifi.h" #include "nm-device-private.h" #include "nm-utils.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" #include "nm-supplicant-manager.h" diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c index 9ac7052e96..d8b87d2369 100644 --- a/src/devices/wifi/nm-wifi-ap-utils.c +++ b/src/devices/wifi/nm-wifi-ap-utils.c @@ -25,6 +25,7 @@ #include +#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-utils.h" diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c index 7166e1f8bd..6502e88326 100644 --- a/src/devices/wifi/nm-wifi-ap.c +++ b/src/devices/wifi/nm-wifi-ap.c @@ -24,16 +24,14 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-wifi-ap.h" #include "nm-wifi-ap-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-core-internal.h" #include "nm-setting-wireless.h" -#include "gsystem-local-alloc.h" #include "nm-access-point-glue.h" diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c index b7323b845d..9b0092c3d9 100644 --- a/src/devices/wifi/tests/test-wifi-ap-utils.c +++ b/src/devices/wifi/tests/test-wifi-ap-utils.c @@ -22,12 +22,11 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-dbus-glib-types.h" #include "nm-core-internal.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c index bd115b429a..9fdcef46ea 100644 --- a/src/devices/wwan/nm-device-modem.c +++ b/src/devices/wwan/nm-device-modem.c @@ -22,12 +22,11 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-modem.h" #include "nm-modem.h" #include "nm-device-private.h" #include "nm-rfkill-manager.h" -#include "nm-logging.h" #include "nm-settings-connection.h" #include "nm-modem-broadband.h" #include "NetworkManagerUtils.h" diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index 2c07b36f65..fc782481fd 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -27,7 +27,7 @@ #include "nm-modem-broadband.h" #include "nm-core-internal.h" -#include "nm-logging.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-platform.h" diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c index 92ac0a189c..c472bc4206 100644 --- a/src/devices/wwan/nm-modem-manager.c +++ b/src/devices/wwan/nm-modem-manager.c @@ -27,7 +27,7 @@ #include #include "nm-modem-manager.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-modem.h" #include "nm-modem-broadband.h" diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c index b74d72c0eb..be35ffd31f 100644 --- a/src/devices/wwan/nm-modem.c +++ b/src/devices/wwan/nm-modem.c @@ -25,7 +25,7 @@ #include "nm-modem.h" #include "nm-platform.h" #include "nm-setting-connection.h" -#include "nm-logging.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-device-private.h" #include "nm-dbus-glib-types.h" diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h index 0889f7231a..35b80ba15b 100644 --- a/src/devices/wwan/nm-modem.h +++ b/src/devices/wwan/nm-modem.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_MODEM_H__ #define __NETWORKMANAGER_MODEM_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "ppp-manager/nm-ppp-manager.h" #include "nm-device.h" diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c index 863c5828fe..479b5a94cc 100644 --- a/src/devices/wwan/nm-wwan-factory.c +++ b/src/devices/wwan/nm-wwan-factory.c @@ -29,7 +29,7 @@ #include "nm-setting-cdma.h" #include "nm-modem-manager.h" #include "nm-device-modem.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" static GType nm_wwan_factory_get_type (void); diff --git a/src/devices/wwan/nm-wwan-factory.h b/src/devices/wwan/nm-wwan-factory.h index fc85a92ca8..78031e60f6 100644 --- a/src/devices/wwan/nm-wwan-factory.h +++ b/src/devices/wwan/nm-wwan-factory.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_WWAN_FACTORY_H__ #define __NETWORKMANAGER_WWAN_FACTORY_H__ -#include "nm-glib.h" +#include "nm-default.h" #define NM_TYPE_WWAN_FACTORY (nm_wwan_factory_get_type ()) #define NM_WWAN_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_WWAN_FACTORY, NMWwanFactory)) diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index b56072409a..332f2d3a40 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -5,6 +5,7 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ -DNMRUNDIR=\"$(nmrundir)\" diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index c00782f963..1032812b9f 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -28,10 +28,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-dbus-glib-types.h" #include "nm-dhcp-client.h" #include "nm-dhcp-utils.h" diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h index b5f30c5ed7..6e6e0fe89d 100644 --- a/src/dhcp-manager/nm-dhcp-client.h +++ b/src/dhcp-manager/nm-dhcp-client.h @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #define NM_TYPE_DHCP_CLIENT (nm_dhcp_client_get_type ()) #define NM_DHCP_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient)) diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 4c889e73ac..3456ce7df3 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -24,14 +24,13 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-utils.h" #include "nm-ip4-config.h" #include "nm-utils.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "nm-macros-internal.h" #define CLIENTID_TAG "send dhcp-client-identifier" diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp-manager/nm-dhcp-dhclient-utils.h index 70ad7a17f1..970c6bd1af 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.h +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.h @@ -22,7 +22,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" char *nm_dhcp_dhclient_create_config (const char *interface, gboolean is_ip6, diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index d6dde54cc8..4fcba5ce6a 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -34,15 +34,13 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-dhclient.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-manager.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-listener.h" -#include "gsystem-local-alloc.h" G_DEFINE_TYPE (NMDhcpDhclient, nm_dhcp_dhclient, NM_TYPE_DHCP_CLIENT) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.h b/src/dhcp-manager/nm-dhcp-dhclient.h index dba9011160..3e8d9c5d8e 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.h +++ b/src/dhcp-manager/nm-dhcp-dhclient.h @@ -19,7 +19,7 @@ #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_H__ #define __NETWORKMANAGER_DHCP_DHCLIENT_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-client.h" #define NM_TYPE_DHCP_DHCLIENT (nm_dhcp_dhclient_get_type ()) diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 716ec84fc9..955e616061 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -32,11 +32,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-dhcpcd.h" #include "nm-dhcp-manager.h" #include "nm-utils.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-listener.h" diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c index dde95aa086..4086094c90 100644 --- a/src/dhcp-manager/nm-dhcp-helper.c +++ b/src/dhcp-manager/nm-dhcp-helper.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client" diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index d675dcfcd4..1fb8e361c8 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -29,10 +29,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-listener.h" #include "nm-core-internal.h" -#include "nm-logging.h" #include "nm-bus-manager.h" #include "nm-dbus-glib-types.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp-manager/nm-dhcp-listener.h b/src/dhcp-manager/nm-dhcp-listener.h index 015c8eb53d..b2631acc5e 100644 --- a/src/dhcp-manager/nm-dhcp-listener.h +++ b/src/dhcp-manager/nm-dhcp-listener.h @@ -19,7 +19,7 @@ #ifndef __NETWORKMANAGER_DHCP_LISTENER_H__ #define __NETWORKMANAGER_DHCP_LISTENER_H__ -#include "nm-glib.h" +#include "nm-default.h" #define NM_TYPE_DHCP_LISTENER (nm_dhcp_listener_get_type ()) #define NM_DHCP_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_LISTENER, NMDhcpListener)) diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index 0f2b8faeb3..f7ccc01c4c 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -33,12 +33,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-manager.h" #include "nm-dhcp-dhclient.h" #include "nm-dhcp-dhcpcd.h" #include "nm-dhcp-systemd.h" -#include "nm-logging.h" #include "nm-config.h" #include "nm-dbus-glib-types.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h index 4286d9f905..8a298f046d 100644 --- a/src/dhcp-manager/nm-dhcp-manager.h +++ b/src/dhcp-manager/nm-dhcp-manager.h @@ -23,7 +23,7 @@ #define __NETWORKMANAGER_DHCP_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-client.h" #include "nm-ip4-config.h" #include "nm-dhcp4-config.h" diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 1ad68a5a36..6fc8b6ef1c 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -29,13 +29,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-systemd.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-dhcp-utils.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "nm-platform.h" #include "nm-sd-adapt.h" diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c index 85fd25746b..cdf26fcae9 100644 --- a/src/dhcp-manager/nm-dhcp-utils.c +++ b/src/dhcp-manager/nm-dhcp-utils.c @@ -24,8 +24,7 @@ #include #include -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-dhcp-utils.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp-manager/nm-dhcp-utils.h index fd9e8e24df..056982c382 100644 --- a/src/dhcp-manager/nm-dhcp-utils.h +++ b/src/dhcp-manager/nm-dhcp-utils.h @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" NMIP4Config *nm_dhcp_utils_ip4_config_from_options (int ifindex, const char *iface, diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c index 14fbe4fead..15817addb4 100644 --- a/src/dhcp-manager/tests/test-dhcp-dhclient.c +++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c @@ -24,8 +24,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-dhcp-dhclient-utils.h" #include "nm-dhcp-utils.h" @@ -33,7 +32,6 @@ #include "nm-ip4-config.h" #include "nm-platform.h" #include "nm-macros-internal.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c index 3bc879812f..0ec105257c 100644 --- a/src/dhcp-manager/tests/test-dhcp-utils.c +++ b/src/dhcp-manager/tests/test-dhcp-utils.c @@ -25,9 +25,8 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dhcp-utils.h" -#include "nm-logging.h" #include "nm-platform.h" #include "nm-test-utils.h" diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index d71a0eb389..62c581e1a4 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -29,10 +29,9 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dns-dnsmasq.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" #include "nm-dns-utils.h" diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 59cddb9a6a..13b41856f1 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -37,13 +37,12 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-core-internal.h" #include "nm-dns-manager.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-config.h" diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index ef1272b985..937238f579 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -24,7 +24,7 @@ #ifndef __NETWORKMANAGER_DNS_MANAGER_H__ #define __NETWORKMANAGER_DNS_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index c384c66342..a53a7fca0a 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -25,9 +25,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dns-plugin.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" typedef struct { diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h index 3e7ce5b174..0a46759850 100644 --- a/src/dns-manager/nm-dns-plugin.h +++ b/src/dns-manager/nm-dns-plugin.h @@ -19,7 +19,7 @@ #ifndef __NETWORKMANAGER_DNS_PLUGIN_H__ #define __NETWORKMANAGER_DNS_PLUGIN_H__ -#include "nm-glib.h" +#include "nm-default.h" #define NM_TYPE_DNS_PLUGIN (nm_dns_plugin_get_type ()) #define NM_DNS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DNS_PLUGIN, NMDnsPlugin)) diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index ea4a2b258e..b53d37ec4c 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -28,10 +28,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dnsmasq-manager.h" #include "nm-dnsmasq-utils.h" -#include "nm-logging.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.h b/src/dnsmasq-manager/nm-dnsmasq-manager.h index 4b43658bef..f7d951b446 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.h +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h @@ -22,7 +22,7 @@ #define __NETWORKMANAGER_DNSMASQ_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-ip4-config.h" #define NM_TYPE_DNSMASQ_MANAGER (nm_dnsmasq_manager_get_type ()) diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.h b/src/dnsmasq-manager/nm-dnsmasq-utils.h index ed0b9ebc81..43d0b9a30b 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-utils.h +++ b/src/dnsmasq-manager/nm-dnsmasq-utils.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__ #define __NETWORKMANAGER_DNSMASQ_UTILS_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-platform.h" gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr, diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c index e36500d2d4..8cc5fa9751 100644 --- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c +++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c @@ -22,9 +22,8 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dnsmasq-utils.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/main-utils.c b/src/main-utils.c index 94437b8b63..1c24f405ab 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -33,11 +33,9 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "main-utils.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" static gboolean sighup_handler (gpointer user_data) diff --git a/src/main-utils.h b/src/main-utils.h index af68568027..cae97b57a5 100644 --- a/src/main-utils.h +++ b/src/main-utils.h @@ -21,7 +21,7 @@ #ifndef __MAIN_UTILS_H__ #define __MAIN_UTILS_H__ -#include "nm-glib.h" +#include "nm-default.h" void nm_main_utils_ensure_root (void); diff --git a/src/main.c b/src/main.c index 9f6ebdf3d2..14a9c46757 100644 --- a/src/main.c +++ b/src/main.c @@ -39,8 +39,7 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "NetworkManagerUtils.h" #include "main-utils.h" @@ -49,7 +48,6 @@ #include "nm-bus-manager.h" #include "nm-device.h" #include "nm-dhcp-manager.h" -#include "nm-logging.h" #include "nm-config.h" #include "nm-session-monitor.h" #include "nm-dispatcher.h" diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c index 2c084b874e..e10182c823 100644 --- a/src/nm-activation-request.c +++ b/src/nm-activation-request.c @@ -26,10 +26,9 @@ #include #include -#include "gsystem-local-alloc.h" #include "nm-activation-request.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" #include "nm-device.h" diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h index 62b4f62846..b93fff5b72 100644 --- a/src/nm-activation-request.h +++ b/src/nm-activation-request.h @@ -22,8 +22,7 @@ #define __NETWORKMANAGER_ACTIVATION_REQUEST_H__ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #include "nm-connection.h" #include "nm-active-connection.h" diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index e52b467136..aeb5bd7835 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -21,18 +21,15 @@ #include "config.h" -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #include "nm-active-connection.h" #include "nm-dbus-interface.h" -#include "nm-logging.h" #include "nm-dbus-glib-types.h" #include "nm-device.h" #include "nm-settings-connection.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "nm-active-connection-glue.h" /* Base class for anything implementing the Connection.Active D-Bus interface */ diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 998ffb1ec7..d429f43077 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -22,7 +22,7 @@ #include "nm-auth-manager.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-errors.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h index 4589651a09..2875cccbaa 100644 --- a/src/nm-auth-manager.h +++ b/src/nm-auth-manager.h @@ -22,7 +22,7 @@ #define NM_AUTH_MANAGER_H -#include "nm-glib.h" +#include "nm-default.h" #include "nm-auth-subject.h" G_BEGIN_DECLS diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c index 7570b3cf58..5e2eaa7250 100644 --- a/src/nm-auth-subject.c +++ b/src/nm-auth-subject.c @@ -33,11 +33,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-enum-types.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" G_DEFINE_TYPE (NMAuthSubject, nm_auth_subject, G_TYPE_OBJECT) diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h index 73013d8622..3205ced720 100644 --- a/src/nm-auth-subject.h +++ b/src/nm-auth-subject.h @@ -25,8 +25,7 @@ #include #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #define NM_TYPE_AUTH_SUBJECT (nm_auth_subject_get_type ()) #define NM_AUTH_SUBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_AUTH_SUBJECT, NMAuthSubject)) diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index e0f770e712..969accb7ba 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -22,11 +22,9 @@ #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-setting-connection.h" #include "nm-auth-utils.h" -#include "nm-logging.h" #include "nm-auth-subject.h" #include "nm-auth-manager.h" #include "nm-session-monitor.h" diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h index f96fbeabe6..4071b12154 100644 --- a/src/nm-auth-utils.h +++ b/src/nm-auth-utils.h @@ -24,8 +24,7 @@ #include #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK "org.freedesktop.NetworkManager.enable-disable-network" #define NM_AUTH_PERMISSION_SLEEP_WAKE "org.freedesktop.NetworkManager.sleep-wake" diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c index 66c117ef21..4ebc1666c5 100644 --- a/src/nm-bus-manager.c +++ b/src/nm-bus-manager.c @@ -26,7 +26,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bus-manager.h" @@ -34,7 +34,6 @@ #include #include #include -#include "nm-logging.h" #include "NetworkManagerUtils.h" #define PRIV_SOCK_PATH NMRUNDIR "/private" diff --git a/src/nm-bus-manager.h b/src/nm-bus-manager.h index 55919cf831..53dbe4498a 100644 --- a/src/nm-bus-manager.h +++ b/src/nm-bus-manager.h @@ -26,8 +26,7 @@ #include #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/nm-config-data.c b/src/nm-config-data.c index 5e015f016e..a804e61a93 100644 --- a/src/nm-config-data.c +++ b/src/nm-config-data.c @@ -24,12 +24,11 @@ #include #include "nm-config.h" -#include "gsystem-local-alloc.h" #include "nm-device.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" #include "nm-macros-internal.h" -#include "nm-logging.h" +#include "nm-default.h" typedef struct { char *group_name; diff --git a/src/nm-config-data.h b/src/nm-config-data.h index 052a6b265b..8b745f2eb0 100644 --- a/src/nm-config-data.h +++ b/src/nm-config-data.h @@ -22,8 +22,7 @@ #define NM_CONFIG_DATA_H -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/nm-config.c b/src/nm-config.c index be04f163c6..24cca2b7fe 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -26,13 +26,11 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-config.h" -#include "nm-logging.h" #include "nm-utils.h" #include "nm-device.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "nm-enum-types.h" #include "nm-core-internal.h" #include "nm-keyfile-internal.h" diff --git a/src/nm-config.h b/src/nm-config.h index e492999f99..e2365ab165 100644 --- a/src/nm-config.h +++ b/src/nm-config.h @@ -23,8 +23,7 @@ #define __NETWORKMANAGER_CONFIG_H__ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #include "nm-config-data.h" G_BEGIN_DECLS diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h index 31b654f3eb..1f15216447 100644 --- a/src/nm-connection-provider.h +++ b/src/nm-connection-provider.h @@ -18,8 +18,7 @@ #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #define NM_TYPE_CONNECTION_PROVIDER (nm_connection_provider_get_type ()) #define NM_CONNECTION_PROVIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTION_PROVIDER, NMConnectionProvider)) diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c index e8b854cdd6..5cfc8d615e 100644 --- a/src/nm-connectivity.c +++ b/src/nm-connectivity.c @@ -27,10 +27,9 @@ #endif -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connectivity.h" #include "nm-config.h" -#include "nm-logging.h" G_DEFINE_TYPE (NMConnectivity, nm_connectivity, G_TYPE_OBJECT) diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h index 66e943cd48..f037403ce8 100644 --- a/src/nm-connectivity.h +++ b/src/nm-connectivity.h @@ -22,9 +22,8 @@ #define __NETWORKMANAGER_CONNECTIVITY_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" -#include "nm-types.h" #define NM_TYPE_CONNECTIVITY (nm_connectivity_get_type ()) #define NM_CONNECTIVITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_CONNECTIVITY, NMConnectivity)) diff --git a/src/nm-dcb.c b/src/nm-dcb.c index b5a1346274..109e56e549 100644 --- a/src/nm-dcb.c +++ b/src/nm-dcb.c @@ -23,11 +23,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dcb.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" static const char *helper_names[] = { "dcbtool", "fcoeadm" }; diff --git a/src/nm-dcb.h b/src/nm-dcb.h index e12fa18030..86e6153d67 100644 --- a/src/nm-dcb.h +++ b/src/nm-dcb.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_DCB_H__ #define __NETWORKMANAGER_DCB_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-setting-dcb.h" gboolean nm_dcb_enable (const char *iface, gboolean enable, GError **error); diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index b36dd44f3a..12399eafed 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -25,7 +25,7 @@ #include "string.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-device.h" #include "nm-vpn-connection.h" #include "nm-platform.h" diff --git a/src/nm-default-route-manager.h b/src/nm-default-route-manager.h index 4c1b032859..2ee4b6d6f4 100644 --- a/src/nm-default-route-manager.h +++ b/src/nm-default-route-manager.h @@ -19,9 +19,8 @@ */ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-connection.h" -#include "nm-types.h" #ifndef __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__ #define __NETWORKMANAGER_DEFAULT_ROUTE_MANAGER_H__ diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c index d2d93d31fd..5b1345ceee 100644 --- a/src/nm-dhcp4-config.c +++ b/src/nm-dhcp4-config.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp4-config.h" #include "nm-dhcp4-config-glue.h" diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c index 6b27c532bd..db7147a6a4 100644 --- a/src/nm-dhcp6-config.c +++ b/src/nm-dhcp6-config.c @@ -22,7 +22,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-dhcp6-config.h" #include "nm-dhcp6-config-glue.h" diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c index d8e6be2f7b..57fb0249c1 100644 --- a/src/nm-dispatcher.c +++ b/src/nm-dispatcher.c @@ -24,12 +24,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dispatcher.h" #include "nm-dispatcher-api.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-logging.h" #include "nm-device.h" #include "nm-dhcp4-config.h" #include "nm-dhcp6-config.h" diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h index d4ea329d34..94f48ab168 100644 --- a/src/nm-dispatcher.h +++ b/src/nm-dispatcher.h @@ -24,8 +24,7 @@ #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #include "nm-connection.h" typedef enum { diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c index 1023842332..9ad734d8af 100644 --- a/src/nm-exported-object.c +++ b/src/nm-exported-object.c @@ -25,7 +25,7 @@ #include "nm-exported-object.h" #include "nm-dbus-glib-types.h" #include "nm-bus-manager.h" -#include "nm-logging.h" +#include "nm-default.h" static GHashTable *prefix_counters; diff --git a/src/nm-exported-object.h b/src/nm-exported-object.h index ed67a6dbc8..e0ffd9e06b 100644 --- a/src/nm-exported-object.h +++ b/src/nm-exported-object.h @@ -23,8 +23,7 @@ #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c index 304ee7e932..93792b8799 100644 --- a/src/nm-firewall-manager.c +++ b/src/nm-firewall-manager.c @@ -22,10 +22,8 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-firewall-manager.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" #define NM_FIREWALL_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h index 6423cbbb18..19d9689788 100644 --- a/src/nm-firewall-manager.h +++ b/src/nm-firewall-manager.h @@ -21,7 +21,7 @@ #ifndef __NETWORKMANAGER_FIREWALL_MANAGER_H__ #define __NETWORKMANAGER_FIREWALL_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #define FIREWALL_DBUS_SERVICE "org.fedoraproject.FirewallD1" #define FIREWALL_DBUS_PATH "/org/fedoraproject/FirewallD1" diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index a35d0d7c04..07b3d34855 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -37,12 +37,10 @@ * Forward declare if_nametoindex. */ extern unsigned int if_nametoindex (const char *__ifname); -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" #include "nm-dhcp-manager.h" -#include "nm-logging.h" #include "main-utils.h" #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c index 389e99c662..f365fd065c 100644 --- a/src/nm-ip4-config.c +++ b/src/nm-ip4-config.c @@ -26,6 +26,7 @@ #include "nm-ip4-config.h" +#include "nm-default.h" #include "nm-utils.h" #include "nm-platform.h" #include "nm-dbus-glib-types.h" @@ -34,7 +35,6 @@ #include "nm-core-internal.h" #include "nm-route-manager.h" #include "nm-core-internal.h" -#include "gsystem-local-alloc.h" G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_EXPORTED_OBJECT) diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c index 1206da87c5..b4b5b3e19c 100644 --- a/src/nm-ip6-config.c +++ b/src/nm-ip6-config.c @@ -24,7 +24,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-ip6-config.h" #include "nm-utils.h" diff --git a/src/nm-logging.c b/src/nm-logging.c index 6ee09fbf3d..b74f1a0ee9 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -39,10 +39,8 @@ #include #endif -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-errors.h" -#include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" static void diff --git a/src/nm-logging.h b/src/nm-logging.h index a346a7a657..b334075d37 100644 --- a/src/nm-logging.h +++ b/src/nm-logging.h @@ -26,8 +26,9 @@ #error nm-test-utils.h must be included as last header #endif +#include "nm-logging.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-macros-internal.h" /* Log domains */ diff --git a/src/nm-manager.c b/src/nm-manager.c index b14c26267f..224f084649 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -30,10 +30,8 @@ #include #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-manager.h" -#include "nm-logging.h" #include "nm-bus-manager.h" #include "nm-vpn-manager.h" #include "nm-device.h" diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c index 8a7e4d1dac..da3507d0b3 100644 --- a/src/nm-multi-index.c +++ b/src/nm-multi-index.c @@ -20,7 +20,7 @@ #include "config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-multi-index.h" #include diff --git a/src/nm-multi-index.h b/src/nm-multi-index.h index 3438d1cf60..046e2431b8 100644 --- a/src/nm-multi-index.h +++ b/src/nm-multi-index.h @@ -21,7 +21,7 @@ #ifndef __NM_MULTI_INDEX__ #define __NM_MULTI_INDEX__ -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/nm-policy.c b/src/nm-policy.c index 2f924ee664..939ddfeeb1 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -27,11 +27,10 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-policy.h" #include "NetworkManagerUtils.h" #include "nm-activation-request.h" -#include "nm-logging.h" #include "nm-device.h" #include "nm-default-route-manager.h" #include "nm-setting-ip4-config.h" diff --git a/src/nm-policy.h b/src/nm-policy.h index 76653529ea..7824f3ea72 100644 --- a/src/nm-policy.h +++ b/src/nm-policy.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_POLICY_H__ #define __NETWORKMANAGER_POLICY_H__ -#include "nm-types.h" +#include "nm-default.h" #define NM_TYPE_POLICY (nm_policy_get_type ()) #define NM_POLICY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_POLICY, NMPolicy)) diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c index 27f3ca0124..c1f288a0c6 100644 --- a/src/nm-rfkill-manager.c +++ b/src/nm-rfkill-manager.c @@ -24,7 +24,7 @@ #include #include "nm-rfkill-manager.h" -#include "nm-logging.h" +#include "nm-default.h" typedef struct { GUdevClient *client; diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h index cea6c7aee1..9b8e23df5f 100644 --- a/src/nm-rfkill-manager.h +++ b/src/nm-rfkill-manager.h @@ -20,8 +20,7 @@ */ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__ #define __NETWORKMANAGER_RFKILL_MANAGER_H__ diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 5ee6c8654f..9c5d9be2b3 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -26,8 +26,7 @@ #include "nm-platform.h" #include "nmp-object.h" #include "nm-core-internal.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" /* if within half a second after adding an IP address a matching device-route shows diff --git a/src/nm-route-manager.h b/src/nm-route-manager.h index e72bce735c..9a08496f1d 100644 --- a/src/nm-route-manager.h +++ b/src/nm-route-manager.h @@ -19,8 +19,7 @@ */ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #ifndef __NETWORKMANAGER_ROUTE_MANAGER_H__ #define __NETWORKMANAGER_ROUTE_MANAGER_H__ diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 8a12552945..fb8b7e1cbd 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -26,9 +26,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-session-monitor.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #ifdef SESSION_TRACKING_SYSTEMD diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h index ef7bd5161f..dfc86a85b1 100644 --- a/src/nm-session-monitor.h +++ b/src/nm-session-monitor.h @@ -22,8 +22,7 @@ #define __NETWORKMANAGER_SESSION_MONITOR_H__ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c index 175c0c1233..620cf93524 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -25,8 +25,7 @@ #include #include -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c index e3599a2fc5..c65609cf40 100644 --- a/src/nm-sleep-monitor-upower.c +++ b/src/nm-sleep-monitor-upower.c @@ -22,8 +22,7 @@ #include #include #include -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-sleep-monitor.h" diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h index 3f13d3256f..21e6b844c8 100644 --- a/src/nm-sleep-monitor.h +++ b/src/nm-sleep-monitor.h @@ -21,8 +21,7 @@ #define __NETWORKMANAGER_SLEEP_MONITOR_H__ -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c index d5aeb0301f..03ff8a5bdd 100644 --- a/src/platform/nm-fake-platform.c +++ b/src/platform/nm-fake-platform.c @@ -26,11 +26,10 @@ #include #include -#include "gsystem-local-alloc.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-fake-platform.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index f3a9254531..60fe737a9c 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -50,14 +50,13 @@ #endif #endif -#include "gsystem-local-alloc.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" #include "nm-linux-platform.h" #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-logging.h" +#include "nm-default.h" #include "wifi/wifi-utils.h" #include "wifi/wifi-utils-wext.h" #include "nmp-object.h" diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c index 73506c7659..c551201e67 100644 --- a/src/platform/nm-platform-utils.c +++ b/src/platform/nm-platform-utils.c @@ -29,10 +29,9 @@ #include #include -#include "gsystem-local-alloc.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-setting-wired.h" diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 5e9f969737..bd8ab8b262 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -29,13 +29,12 @@ #include #include -#include "gsystem-local-alloc.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" #include "nm-platform.h" #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-enum-types.h" #include "nm-core-internal.h" diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h index 448101da4c..59e8901140 100644 --- a/src/platform/nm-platform.h +++ b/src/platform/nm-platform.h @@ -26,8 +26,7 @@ #include #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #define NM_TYPE_PLATFORM (nm_platform_get_type ()) diff --git a/src/platform/nmp-object.c b/src/platform/nmp-object.c index 51684b93c7..05f63b2792 100644 --- a/src/platform/nmp-object.c +++ b/src/platform/nmp-object.c @@ -25,7 +25,7 @@ #include "nm-platform-utils.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" -#include "nm-logging.h" +#include "nm-default.h" /*********************************************************************************************/ diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c index 933e124ffd..6c95830678 100644 --- a/src/platform/tests/monitor.c +++ b/src/platform/tests/monitor.c @@ -3,10 +3,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-fake-platform.h" #include "nm-linux-platform.h" -#include "nm-logging.h" int main (int argc, char **argv) diff --git a/src/platform/tests/platform.c b/src/platform/tests/platform.c index ebf162a98a..31f36351f1 100644 --- a/src/platform/tests/platform.c +++ b/src/platform/tests/platform.c @@ -26,7 +26,7 @@ #include #include -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "nm-platform.h" #include "nm-linux-platform.h" #include "nm-fake-platform.h" diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h index 3d6475433e..e69f956f5a 100644 --- a/src/platform/tests/test-common.h +++ b/src/platform/tests/test-common.h @@ -4,7 +4,7 @@ #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" #include "nm-fake-platform.h" #include "nm-linux-platform.h" diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c index 94d9650365..b1dd454e28 100644 --- a/src/platform/tests/test-general.c +++ b/src/platform/tests/test-general.c @@ -23,7 +23,7 @@ #include #include "nm-linux-platform.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c index 88bb070784..836353bb2d 100644 --- a/src/platform/tests/test-nmp-object.c +++ b/src/platform/tests/test-nmp-object.c @@ -20,7 +20,7 @@ #include "nmp-object.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c index e427f3368a..a4d4017bc2 100644 --- a/src/platform/wifi/wifi-utils-nl80211.c +++ b/src/platform/wifi/wifi-utils-nl80211.c @@ -36,11 +36,10 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" #include "nm-platform.h" -#include "nm-logging.h" #include "nm-utils.h" typedef struct { diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h index 9e5b206891..21a4c57b62 100644 --- a/src/platform/wifi/wifi-utils-private.h +++ b/src/platform/wifi/wifi-utils-private.h @@ -22,7 +22,7 @@ #define __WIFI_UTILS_PRIVATE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "wifi-utils.h" diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c index 52d1e49b1c..0d7488b3ed 100644 --- a/src/platform/wifi/wifi-utils-wext.c +++ b/src/platform/wifi/wifi-utils-wext.c @@ -29,10 +29,9 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "wifi-utils-private.h" #include "wifi-utils-wext.h" -#include "nm-logging.h" #include "nm-utils.h" /* Hacks necessary to #include wireless.h; yay for WEXT */ diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c index eab99bf860..5f2f61b0d0 100644 --- a/src/platform/wifi/wifi-utils.c +++ b/src/platform/wifi/wifi-utils.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "wifi-utils.h" #include "wifi-utils-private.h" #include "wifi-utils-nl80211.h" diff --git a/src/platform/wifi/wifi-utils.h b/src/platform/wifi/wifi-utils.h index a5c9feaf49..21dac9e9cc 100644 --- a/src/platform/wifi/wifi-utils.h +++ b/src/platform/wifi/wifi-utils.h @@ -24,7 +24,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" typedef struct WifiData WifiData; diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index 15a738c921..ee5788f7c2 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -3,6 +3,7 @@ if WITH_PPP AM_CPPFLAGS = \ -I${top_srcdir}/include \ -I${top_srcdir}/libnm-core \ + -I${top_srcdir}/src \ -I${top_builddir}/libnm-core \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index f767c29e31..e3739d95d5 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -42,10 +42,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ppp-manager.h" -#include "nm-logging.h" #include "nm-platform.h" #include "nm-core-internal.h" diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c index 9b07519b01..1f1016ae8a 100644 --- a/src/ppp-manager/nm-pppd-plugin.c +++ b/src/ppp-manager/nm-pppd-plugin.c @@ -34,7 +34,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-pppd-plugin.h" #include "nm-ppp-status.h" diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c index 68f43c0e52..25ba3f7fb7 100644 --- a/src/rdisc/nm-fake-rdisc.c +++ b/src/rdisc/nm-fake-rdisc.c @@ -26,7 +26,7 @@ #include "nm-fake-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-logging.h" +#include "nm-default.h" #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__) #define warning(...) nm_log_warn (LOGD_IP6, __VA_ARGS__) diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c index 46f814767f..f31a13b2a1 100644 --- a/src/rdisc/nm-lndp-rdisc.c +++ b/src/rdisc/nm-lndp-rdisc.c @@ -30,7 +30,7 @@ #include "nm-rdisc-private.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-platform.h" #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__) diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c index 09d1f5fb16..35436e9d11 100644 --- a/src/rdisc/nm-rdisc.c +++ b/src/rdisc/nm-rdisc.c @@ -27,7 +27,7 @@ #include "nm-rdisc.h" #include "nm-rdisc-private.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-utils.h" #define debug(...) nm_log_dbg (LOGD_IP6, __VA_ARGS__) diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h index 4c83fb4e36..def63ee6fc 100644 --- a/src/rdisc/nm-rdisc.h +++ b/src/rdisc/nm-rdisc.h @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #define NM_TYPE_RDISC (nm_rdisc_get_type ()) diff --git a/src/rdisc/tests/test-rdisc-fake.c b/src/rdisc/tests/test-rdisc-fake.c index 33672637d0..3b248dc69b 100644 --- a/src/rdisc/tests/test-rdisc-fake.c +++ b/src/rdisc/tests/test-rdisc-fake.c @@ -25,7 +25,7 @@ #include "nm-rdisc.h" #include "nm-fake-rdisc.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-fake-platform.h" diff --git a/src/rdisc/tests/test-rdisc-linux.c b/src/rdisc/tests/test-rdisc-linux.c index eddb3b0eb4..184573bc2e 100644 --- a/src/rdisc/tests/test-rdisc-linux.c +++ b/src/rdisc/tests/test-rdisc-linux.c @@ -25,7 +25,7 @@ #include "nm-rdisc.h" #include "nm-lndp-rdisc.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-linux-platform.h" diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index eaf5ff3f2b..e1333bab53 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -26,9 +26,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" -#include "nm-logging.h" #include "nm-agent-manager.h" #include "nm-secret-agent.h" #include "nm-auth-utils.h" diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 2c4fe9e6d8..681933cd29 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -25,9 +25,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-inotify-helper.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" /* NOTE: this code should be killed once we depend on a new enough glib to diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h index 1dd73a5aca..b4e2c61225 100644 --- a/src/settings/nm-inotify-helper.h +++ b/src/settings/nm-inotify-helper.h @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" /* NOTE: this code should be killed once we depend on a new enough glib to * include the patches from https://bugzilla.gnome.org/show_bug.cgi?id=532815 diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c index 5f659d23e7..43885fee41 100644 --- a/src/settings/nm-secret-agent.c +++ b/src/settings/nm-secret-agent.c @@ -26,12 +26,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-secret-agent.h" #include "nm-bus-manager.h" #include "nm-dbus-glib-types.h" -#include "nm-logging.h" #include "nm-auth-subject.h" #include "nm-simple-connection.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h index d8712c59ed..aedc3d21f9 100644 --- a/src/settings/nm-secret-agent.h +++ b/src/settings/nm-secret-agent.h @@ -23,8 +23,7 @@ #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" #define NM_TYPE_SECRET_AGENT (nm_secret_agent_get_type ()) #define NM_SECRET_AGENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent)) diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index ec0d6c230e..b4300e02c5 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -26,18 +26,16 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-settings-connection.h" #include "nm-session-monitor.h" #include "nm-dbus-glib-types.h" -#include "nm-logging.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" #include "nm-agent-manager.h" #include "NetworkManagerUtils.h" #include "nm-core-internal.h" #include "nm-audit-manager.h" -#include "gsystem-local-alloc.h" #define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps" #define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids" diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h index 734d917877..b4b48271ba 100644 --- a/src/settings/nm-settings-connection.h +++ b/src/settings/nm-settings-connection.h @@ -26,7 +26,7 @@ #include "nm-exported-object.h" #include -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index e0e3af64ce..d7b76c9cf6 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -38,7 +38,6 @@ #include #endif -#include "gsystem-local-alloc.h" #include #include #include @@ -66,7 +65,7 @@ #include "nm-settings.h" #include "nm-settings-connection.h" #include "nm-system-config-interface.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-bus-manager.h" #include "nm-auth-utils.h" #include "nm-auth-subject.h" diff --git a/src/settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h index 1dce93189e..81a422d671 100644 --- a/src/settings/nm-system-config-interface.h +++ b/src/settings/nm-system-config-interface.h @@ -24,8 +24,7 @@ #include -#include "nm-glib.h" -#include "nm-types.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c index 2c3504f309..feb02dde1e 100644 --- a/src/settings/plugins/ibft/plugin.c +++ b/src/settings/plugins/ibft/plugin.c @@ -29,10 +29,9 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-glib-types.h" #include "nm-system-config-interface.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "plugin.h" diff --git a/src/settings/plugins/ibft/plugin.h b/src/settings/plugins/ibft/plugin.h index f9426fcb04..d86b018466 100644 --- a/src/settings/plugins/ibft/plugin.h +++ b/src/settings/plugins/ibft/plugin.h @@ -21,7 +21,7 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-glib.h" +#include "nm-default.h" #define SC_TYPE_PLUGIN_IBFT (sc_plugin_ibft_get_type ()) #define SC_PLUGIN_IBFT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IBFT, SCPluginIbft)) diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index 45006f7f1a..81c83a6f6a 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -33,11 +33,10 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" #include "reader.h" diff --git a/src/settings/plugins/ibft/reader.h b/src/settings/plugins/ibft/reader.h index bea32e2497..42969ae0f3 100644 --- a/src/settings/plugins/ibft/reader.h +++ b/src/settings/plugins/ibft/reader.h @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" gboolean read_ibft_blocks (const char *iscsiadm_path, GSList **out_blocks, diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c index 980a9ceed1..c7aef050db 100644 --- a/src/settings/plugins/ibft/tests/test-ibft.c +++ b/src/settings/plugins/ibft/tests/test-ibft.c @@ -33,7 +33,7 @@ #include "NetworkManagerUtils.h" #include "reader.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/common.h b/src/settings/plugins/ifcfg-rh/common.h index 168177ff9a..5d6ebe6d65 100644 --- a/src/settings/plugins/ifcfg-rh/common.h +++ b/src/settings/plugins/ifcfg-rh/common.h @@ -21,7 +21,7 @@ #ifndef __COMMON_H__ #define __COMMON_H__ -#include "nm-glib.h" +#include "nm-default.h" #define IFCFG_TAG "ifcfg-" #define KEYS_TAG "keys-" diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c index 026ce59565..acb5b1ece2 100644 --- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c +++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c @@ -34,7 +34,8 @@ #include #include #include "nm-platform.h" -#include "nm-logging.h" + +#include "nm-default.h" #include "common.h" #include "nm-config.h" diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index 4b968aa08d..c35192492d 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -42,13 +42,12 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "common.h" #include "nm-dbus-glib-types.h" #include "plugin.h" #include "nm-system-config-interface.h" #include "nm-config.h" -#include "nm-logging.h" #include "NetworkManagerUtils.h" #include "nm-ifcfg-connection.h" @@ -56,7 +55,6 @@ #include "reader.h" #include "writer.h" #include "utils.h" -#include "gsystem-local-alloc.h" #define IFCFGRH1_DBUS_SERVICE_NAME "com.redhat.ifcfgrh1" #define IFCFGRH1_DBUS_OBJECT_PATH "/com/redhat/ifcfgrh1" diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 69f08ebffd..41fe18d052 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -48,14 +48,12 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include #include "nm-platform.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" #include "common.h" #include "shvar.h" diff --git a/src/settings/plugins/ifcfg-rh/reader.h b/src/settings/plugins/ifcfg-rh/reader.h index a9f830f119..88f9a72007 100644 --- a/src/settings/plugins/ifcfg-rh/reader.h +++ b/src/settings/plugins/ifcfg-rh/reader.h @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "shvar.h" NMConnection *connection_from_file (const char *filename, diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c index 283aa82611..fad1478521 100644 --- a/src/settings/plugins/ifcfg-rh/shvar.c +++ b/src/settings/plugins/ifcfg-rh/shvar.c @@ -36,9 +36,8 @@ #include "shvar.h" -#include "gsystem-local-alloc.h" #include "nm-core-internal.h" -#include "nm-logging.h" +#include "nm-default.h" #define PARSE_WARNING(msg...) nm_log_warn (LOGD_SETTINGS, " " msg) diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h index 1778206577..876be3ade0 100644 --- a/src/settings/plugins/ifcfg-rh/shvar.h +++ b/src/settings/plugins/ifcfg-rh/shvar.h @@ -31,7 +31,7 @@ #ifndef _SHVAR_H #define _SHVAR_H -#include "nm-glib.h" +#include "nm-default.h" G_BEGIN_DECLS diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c index 14473ffbc5..16bc14d6b0 100644 --- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c +++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @@ -54,7 +54,7 @@ #include "reader.h" #include "writer.h" #include "utils.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c index 4d38c9b1c0..599e3a49f0 100644 --- a/src/settings/plugins/ifcfg-rh/utils.c +++ b/src/settings/plugins/ifcfg-rh/utils.c @@ -23,11 +23,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "nm-macros-internal.h" #include "NetworkManagerUtils.h" -#include "gsystem-local-alloc.h" #include "utils.h" #include "shvar.h" diff --git a/src/settings/plugins/ifcfg-rh/utils.h b/src/settings/plugins/ifcfg-rh/utils.h index d8b4784cea..329f4547ca 100644 --- a/src/settings/plugins/ifcfg-rh/utils.h +++ b/src/settings/plugins/ifcfg-rh/utils.h @@ -22,10 +22,9 @@ #define _UTILS_H_ #include -#include "nm-glib.h" +#include "nm-default.h" #include "shvar.h" #include "common.h" -#include "nm-logging.h" #define NM_IFCFG_CONNECTION_LOG_PATH(path) str_if_set (path,"in-memory") #define NM_IFCFG_CONNECTION_LOG_FMT "%s (%s,\"%s\")" diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c index d95915f4f2..35c1518c2b 100644 --- a/src/settings/plugins/ifcfg-rh/writer.c +++ b/src/settings/plugins/ifcfg-rh/writer.c @@ -45,8 +45,7 @@ #include "nm-core-internal.h" #include "nm-macros-internal.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "common.h" #include "shvar.h" #include "reader.h" diff --git a/src/settings/plugins/ifcfg-rh/writer.h b/src/settings/plugins/ifcfg-rh/writer.h index 2c7168d330..69389361c9 100644 --- a/src/settings/plugins/ifcfg-rh/writer.h +++ b/src/settings/plugins/ifcfg-rh/writer.h @@ -25,7 +25,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" gboolean writer_can_write_connection (NMConnection *connection, GError **error); diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 888ee589ad..619eb3e5de 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -28,7 +28,7 @@ #include #include "nm-system-config-interface.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-core-internal.h" #include "NetworkManagerUtils.h" diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c index 637533517b..81ea04314e 100644 --- a/src/settings/plugins/ifnet/net_parser.c +++ b/src/settings/plugins/ifnet/net_parser.c @@ -27,7 +27,7 @@ #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "plugin.h" #include "nm-platform.h" diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h index c6966248ea..968feaf508 100644 --- a/src/settings/plugins/ifnet/net_parser.h +++ b/src/settings/plugins/ifnet/net_parser.h @@ -22,7 +22,7 @@ #ifndef _NET_PARSER_H #define _NET_PARSER_H -#include "nm-glib.h" +#include "nm-default.h" #define CONF_NET_FILE SYSCONFDIR "/conf.d/net" diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c index 7d0f778b18..c653dd0f10 100644 --- a/src/settings/plugins/ifnet/net_utils.c +++ b/src/settings/plugins/ifnet/net_utils.c @@ -28,9 +28,8 @@ #include #include "NetworkManagerUtils.h" #include -#include "nm-logging.h" #include "nm-config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "net_utils.h" #include "wpa_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/net_utils.h index bcb265dbd4..c1422f6505 100644 --- a/src/settings/plugins/ifnet/net_utils.h +++ b/src/settings/plugins/ifnet/net_utils.h @@ -25,7 +25,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "net_parser.h" #define has_default_ip4_route(conn_name) has_default_route((conn_name), &is_ip4_address) #define has_default_ip6_route(conn_name) has_default_route((conn_name), &is_ip6_address) diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c index df1598ee5f..7edb03256b 100644 --- a/src/settings/plugins/ifnet/nm-ifnet-connection.c +++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c @@ -28,7 +28,7 @@ #include #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "nm-ifnet-connection.h" #include "connection_parser.h" #include "net_parser.h" diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c index b82a9d07cb..d11bf9a660 100644 --- a/src/settings/plugins/ifnet/plugin.c +++ b/src/settings/plugins/ifnet/plugin.c @@ -29,10 +29,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-system-config-interface.h" -#include "nm-logging.h" #include "nm-ifnet-connection.h" #include "nm-config.h" diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h index 89e0fa3b86..cb8767bd96 100644 --- a/src/settings/plugins/ifnet/plugin.h +++ b/src/settings/plugins/ifnet/plugin.h @@ -23,7 +23,7 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-glib.h" +#include "nm-default.h" #define SC_TYPE_PLUGIN_IFNET (sc_plugin_ifnet_get_type ()) #define SC_PLUGIN_IFNET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFNET, SCPluginIfnet)) diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c index 18876e62c6..96fb5dd378 100644 --- a/src/settings/plugins/ifnet/tests/test-ifnet.c +++ b/src/settings/plugins/ifnet/tests/test-ifnet.c @@ -29,9 +29,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-linux-platform.h" -#include "nm-logging.h" #include "net_parser.h" #include "net_utils.h" diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c index 5338e789f8..51474ee433 100644 --- a/src/settings/plugins/ifnet/wpa_parser.c +++ b/src/settings/plugins/ifnet/wpa_parser.c @@ -24,7 +24,7 @@ #include #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "wpa_parser.h" #include "net_parser.h" #include "net_utils.h" diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h index 9f2cf6054d..8099d19c62 100644 --- a/src/settings/plugins/ifnet/wpa_parser.h +++ b/src/settings/plugins/ifnet/wpa_parser.h @@ -22,7 +22,7 @@ #ifndef _WPA_PARSER_H #define _WPA_PARSER_H -#include "nm-glib.h" +#include "nm-default.h" #define WPA_SUPPLICANT_CONF SYSCONFDIR "/wpa_supplicant/wpa_supplicant.conf" diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c index 32d27c57b5..4606f5ab63 100644 --- a/src/settings/plugins/ifupdown/interface_parser.c +++ b/src/settings/plugins/ifupdown/interface_parser.c @@ -29,7 +29,7 @@ #include #include #include "nm-utils.h" -#include "nm-logging.h" +#include "nm-default.h" if_block* first; if_block* last; diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h index 0b6c8c9f21..4034d44c5c 100644 --- a/src/settings/plugins/ifupdown/interface_parser.h +++ b/src/settings/plugins/ifupdown/interface_parser.h @@ -24,7 +24,7 @@ #ifndef _INTERFACE_PARSER_H #define _INTERFACE_PARSER_H -#include "nm-glib.h" +#include "nm-default.h" typedef struct _if_data { diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c index 49c2328a09..d66789abca 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c @@ -30,7 +30,7 @@ #include #include #include -#include "nm-logging.h" +#include "nm-default.h" #include "nm-ifupdown-connection.h" #include "parser.h" diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h index bc2df73123..54c219f4e7 100644 --- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h +++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h @@ -25,7 +25,7 @@ #define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__ #include -#include "nm-glib.h" +#include "nm-default.h" #include "interface_parser.h" G_BEGIN_DECLS diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c index 15081a4c59..1f9553def8 100644 --- a/src/settings/plugins/ifupdown/parser.c +++ b/src/settings/plugins/ifupdown/parser.c @@ -31,7 +31,7 @@ #include "nm-core-internal.h" #include "nm-system-config-interface.h" -#include "nm-logging.h" +#include "nm-default.h" #include "parser.h" #include "plugin.h" diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index f2a700c190..6e676cac2b 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -30,7 +30,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "interface_parser.h" #include "nm-dbus-interface.h" @@ -46,7 +46,6 @@ #include "plugin.h" #include "parser.h" -#include "nm-logging.h" #include "nm-config.h" #include diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h index a9aa56f45a..8eab4f2ffa 100644 --- a/src/settings/plugins/ifupdown/plugin.h +++ b/src/settings/plugins/ifupdown/plugin.h @@ -24,7 +24,7 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#include "nm-glib.h" +#include "nm-default.h" #define PLUGIN_NAME "ifupdown" diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c index edadd283e3..24e8afdc8b 100644 --- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c +++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c @@ -22,12 +22,10 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" -#include "nm-logging.h" #include "interface_parser.h" #include "parser.h" -#include "nm-logging.h" #include "nm-test-utils.h" 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 #include +#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 98c4fc513d..467cbdbf0e 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -34,8 +34,7 @@ #include #include #include "nm-config.h" -#include "nm-logging.h" -#include "nm-glib.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 -#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/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 #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 #include -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "utils.h" #include #include 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 #include -#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 -#include "nm-glib.h" +#include "nm-default.h" gboolean nm_keyfile_plugin_write_connection (NMConnection *connection, const char *existing_path, diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index 62fc8e0a43..722645dd9c 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -25,10 +25,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" -#include "nm-logging.h" #include "nm-setting.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h index 5b5356cd48..76a404ddd7 100644 --- a/src/supplicant-manager/nm-supplicant-config.h +++ b/src/supplicant-manager/nm-supplicant-config.h @@ -25,7 +25,7 @@ #include #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-types.h" G_BEGIN_DECLS diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 56bd5dc46a..854a774a47 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -24,12 +24,10 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-supplicant-interface.h" -#include "nm-logging.h" #include "nm-supplicant-config.h" -#include "gsystem-local-alloc.h" #include "nm-core-internal.h" #include "nm-dbus-compat.h" diff --git a/src/supplicant-manager/nm-supplicant-interface.h b/src/supplicant-manager/nm-supplicant-interface.h index 9d930f2f8b..79c88dabaa 100644 --- a/src/supplicant-manager/nm-supplicant-interface.h +++ b/src/supplicant-manager/nm-supplicant-interface.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ #define __NETWORKMANAGER_SUPPLICANT_INTERFACE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-types.h" /* diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c index fff5c079ee..e0b132e8bd 100644 --- a/src/supplicant-manager/nm-supplicant-manager.c +++ b/src/supplicant-manager/nm-supplicant-manager.c @@ -24,10 +24,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-manager.h" #include "nm-supplicant-interface.h" -#include "nm-logging.h" #include "nm-core-internal.h" #define NM_SUPPLICANT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \ diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h index 0378a4e0e8..d7456467de 100644 --- a/src/supplicant-manager/nm-supplicant-manager.h +++ b/src/supplicant-manager/nm-supplicant-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ #define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-types.h" #include "nm-device.h" diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c index 1114befedc..f2d5654053 100644 --- a/src/supplicant-manager/nm-supplicant-settings-verify.c +++ b/src/supplicant-manager/nm-supplicant-settings-verify.c @@ -25,7 +25,7 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-supplicant-settings-verify.h" struct Opt { diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c index db4342fec7..9e163606ce 100644 --- a/src/supplicant-manager/tests/test-supplicant-config.c +++ b/src/supplicant-manager/tests/test-supplicant-config.c @@ -36,7 +36,7 @@ #include "nm-supplicant-config.h" #include "nm-supplicant-settings-verify.h" -#include "nm-logging.h" +#include "nm-default.h" #include "nm-test-utils.h" diff --git a/src/systemd/nm-sd-adapt.h b/src/systemd/nm-sd-adapt.h index 10592fdbce..d140b9c260 100644 --- a/src/systemd/nm-sd-adapt.h +++ b/src/systemd/nm-sd-adapt.h @@ -39,7 +39,7 @@ #include #include -#include "nm-logging.h" +#include "nm-default.h" /* Missing in Linux 3.2.0, in Ubuntu 12.04 */ #ifndef BPF_XOR diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index beb2a29115..281a5143f4 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -24,10 +24,9 @@ #include "nm-config.h" -#include "nm-glib.h" +#include "nm-default.h" #include "nm-test-device.h" #include "nm-fake-platform.h" -#include "nm-logging.h" #include "nm-bus-manager.h" #include "nm-test-utils.h" diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c index b6ca0b76ad..35f1ed0fad 100644 --- a/src/tests/test-dcb.c +++ b/src/tests/test-dcb.c @@ -22,9 +22,8 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dcb.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c index e652abe342..b56b067195 100644 --- a/src/tests/test-general-with-expect.c +++ b/src/tests/test-general-with-expect.c @@ -26,9 +26,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" #include "nm-multi-index.h" #include "nm-test-utils.h" diff --git a/src/tests/test-general.c b/src/tests/test-general.c index 129802db75..ba3d958fb3 100644 --- a/src/tests/test-general.c +++ b/src/tests/test-general.c @@ -23,9 +23,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" -#include "nm-logging.h" #include "nm-core-internal.h" #include "nm-test-utils.h" diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c index 0bf050663b..828bb3417a 100644 --- a/src/tests/test-ip4-config.c +++ b/src/tests/test-ip4-config.c @@ -23,10 +23,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-ip4-config.h" #include "nm-platform.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c index 1bac506827..8b59f6c477 100644 --- a/src/tests/test-ip6-config.c +++ b/src/tests/test-ip6-config.c @@ -23,10 +23,9 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-ip6-config.h" -#include "nm-logging.h" #include "nm-platform.h" #include "nm-test-utils.h" diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c index f8d3e9d450..db7006ba66 100644 --- a/src/tests/test-resolvconf-capture.c +++ b/src/tests/test-resolvconf-capture.c @@ -23,12 +23,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" #include "nm-platform.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c index 6b31fe1959..fd9af1bb20 100644 --- a/src/tests/test-route-manager.c +++ b/src/tests/test-route-manager.c @@ -23,12 +23,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "test-common.h" #include "nm-platform.h" #include "nm-route-manager.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c index da693c9a3a..989345d805 100644 --- a/src/tests/test-wired-defname.c +++ b/src/tests/test-wired-defname.c @@ -23,9 +23,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device-ethernet-utils.h" -#include "nm-logging.h" #include "nm-test-utils.h" diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index 680fccbd46..3d14fb2db2 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -28,12 +28,11 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-connection.h" #include "nm-ip4-config.h" #include "nm-ip6-config.h" #include "nm-platform.h" -#include "nm-logging.h" #include "nm-active-connection.h" #include "nm-dbus-glib-types.h" #include "NetworkManagerUtils.h" @@ -44,7 +43,6 @@ #include "nm-default-route-manager.h" #include "nm-route-manager.h" #include "nm-firewall-manager.h" -#include "gsystem-local-alloc.h" #include "nm-vpn-connection-glue.h" diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 8dc46c41bf..d7947b4621 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -23,7 +23,7 @@ #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-manager.h" #include "nm-vpn-service.h" #include "nm-vpn-connection.h" @@ -31,8 +31,6 @@ #include "nm-vpn-dbus-interface.h" #include "nm-core-internal.h" #include "nm-enum-types.h" -#include "nm-logging.h" -#include "gsystem-local-alloc.h" G_DEFINE_TYPE (NMVpnManager, nm_vpn_manager, G_TYPE_OBJECT) diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h index c7fe2b1f80..2034e077ad 100644 --- a/src/vpn-manager/nm-vpn-manager.h +++ b/src/vpn-manager/nm-vpn-manager.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_VPN_MANAGER_H__ #define __NETWORKMANAGER_VPN_MANAGER_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-connection.h" #define NM_TYPE_VPN_MANAGER (nm_vpn_manager_get_type ()) diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c index 4661ab4223..c96242c940 100644 --- a/src/vpn-manager/nm-vpn-service.c +++ b/src/vpn-manager/nm-vpn-service.c @@ -27,9 +27,8 @@ #include #include -#include "nm-glib.h" +#include "nm-default.h" #include "nm-vpn-service.h" -#include "nm-logging.h" #include "nm-vpn-manager.h" G_DEFINE_TYPE (NMVpnService, nm_vpn_service, G_TYPE_OBJECT) diff --git a/src/vpn-manager/nm-vpn-service.h b/src/vpn-manager/nm-vpn-service.h index a748d32f39..c43d7cd428 100644 --- a/src/vpn-manager/nm-vpn-service.h +++ b/src/vpn-manager/nm-vpn-service.h @@ -22,7 +22,7 @@ #ifndef __NETWORKMANAGER_VPN_SERVICE_H__ #define __NETWORKMANAGER_VPN_SERVICE_H__ -#include "nm-glib.h" +#include "nm-default.h" #include "nm-device.h" #include "nm-vpn-connection.h" #include "nm-vpn-plugin-info.h" From 7363dc94c6591e8d08910bfbc54a654fa81da37a Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 4 Aug 2015 12:08:20 +0200 Subject: [PATCH 8/9] nm-default: include i18n headers via "nm-default.h" --- include/nm-default.h | 13 +++++++++++++ libnm-core/Makefile.am | 2 +- libnm-glib/Makefile.am | 1 + libnm-util/Makefile.am | 1 + libnm/Makefile.am | 2 +- 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/include/nm-default.h b/include/nm-default.h index 6a2ccff268..f86feac770 100644 --- a/include/nm-default.h +++ b/include/nm-default.h @@ -26,6 +26,7 @@ * Depending on which parts are compiled, different values are set. */ #define NM_NETWORKMANAGER_COMPILATION_DEFAULT 0x0001 #define NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON 0x0002 +#define NM_NETWORKMANAGER_COMPILATION_LIB 0x0004 #ifndef NETWORKMANAGER_COMPILATION /* For convenience, we don't require our Makefile.am to define @@ -44,6 +45,18 @@ /*****************************************************************************/ +#if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB + +#include + +#else + +#include + +#endif /* NM_NETWORKMANAGER_COMPILATION_LIB */ + +/*****************************************************************************/ + #if (NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON /* the header is used inside src/, where additional diff --git a/libnm-core/Makefile.am b/libnm-core/Makefile.am index 08f2afc86a..470fd9af64 100644 --- a/libnm-core/Makefile.am +++ b/libnm-core/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 20a2481120..179f4e61d3 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm-util \ -I$(top_builddir)/libnm-util \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index f508494227..d7d3ba8206 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -I${top_srcdir}/include \ -DG_LOG_DOMAIN=\""libnm-util"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/libnm/Makefile.am b/libnm/Makefile.am index 0a41ab5752..2ae3f87da8 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) \ $(GUDEV_CFLAGS) \ From 22e1a97e122b9c563a4da76bfdb2bd3e77dddccf Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 4 Aug 2015 13:02:19 -0400 Subject: [PATCH 9/9] all: drop includes to for "nm-default.h" The localization headers are now included via "nm-default.h". Also fixes several places, where we wrongly included instead of . For example under "clients/" directory. --- clients/cli/agent.c | 1 - clients/cli/common.c | 1 - clients/cli/connections.c | 1 - clients/cli/devices.c | 2 -- clients/cli/general.c | 2 -- clients/cli/nmcli.c | 2 -- clients/cli/polkit-agent.c | 2 -- clients/cli/settings.c | 2 -- clients/cli/utils.c | 2 -- clients/common/nm-polkit-listener.c | 1 - clients/common/nm-secret-agent-simple.c | 1 - clients/nm-online.c | 2 -- clients/tui/newt/nmt-newt-form.c | 2 -- clients/tui/newt/nmt-newt-popup.c | 2 -- clients/tui/newt/nmt-newt-utils.c | 2 -- clients/tui/nm-editor-utils.c | 1 - clients/tui/nmt-address-list.c | 2 -- clients/tui/nmt-connect-connection-list.c | 1 - clients/tui/nmt-device-entry.c | 1 - clients/tui/nmt-edit-connection-list.c | 2 -- clients/tui/nmt-editor-page.c | 2 -- clients/tui/nmt-editor-section.c | 2 -- clients/tui/nmt-editor.c | 1 - clients/tui/nmt-ip-entry.c | 2 -- clients/tui/nmt-mtu-entry.c | 2 -- clients/tui/nmt-page-bond.c | 2 -- clients/tui/nmt-page-bridge-port.c | 2 -- clients/tui/nmt-page-bridge.c | 2 -- clients/tui/nmt-page-dsl.c | 2 -- clients/tui/nmt-page-ethernet.c | 2 -- clients/tui/nmt-page-infiniband.c | 2 -- clients/tui/nmt-page-ip4.c | 2 -- clients/tui/nmt-page-ip6.c | 2 -- clients/tui/nmt-page-ppp.c | 2 -- clients/tui/nmt-page-team-port.c | 2 -- clients/tui/nmt-page-team.c | 2 -- clients/tui/nmt-page-vlan.c | 2 -- clients/tui/nmt-page-wifi.c | 2 -- clients/tui/nmt-password-dialog.c | 2 -- clients/tui/nmt-password-fields.c | 2 -- clients/tui/nmt-route-editor.c | 2 -- clients/tui/nmt-route-entry.c | 1 - clients/tui/nmt-route-table.c | 1 - clients/tui/nmt-slave-list.c | 1 - clients/tui/nmt-widget-list.c | 2 -- clients/tui/nmtui-connect.c | 2 -- clients/tui/nmtui-edit.c | 1 - clients/tui/nmtui-hostname.c | 2 -- clients/tui/nmtui.c | 2 -- clients/tui/vpn-helpers.c | 1 - libnm-core/crypto.c | 1 - libnm-core/crypto_gnutls.c | 2 -- libnm-core/crypto_nss.c | 2 -- libnm-core/nm-connection.c | 1 - libnm-core/nm-dbus-utils.c | 1 - libnm-core/nm-keyfile-reader.c | 1 - libnm-core/nm-keyfile-writer.c | 1 - libnm-core/nm-setting-8021x.c | 1 - libnm-core/nm-setting-adsl.c | 1 - libnm-core/nm-setting-bluetooth.c | 1 - libnm-core/nm-setting-bond.c | 1 - libnm-core/nm-setting-bridge-port.c | 1 - libnm-core/nm-setting-bridge.c | 1 - libnm-core/nm-setting-cdma.c | 1 - libnm-core/nm-setting-connection.c | 1 - libnm-core/nm-setting-dcb.c | 1 - libnm-core/nm-setting-gsm.c | 1 - libnm-core/nm-setting-infiniband.c | 1 - libnm-core/nm-setting-ip-config.c | 1 - libnm-core/nm-setting-ip4-config.c | 1 - libnm-core/nm-setting-ip6-config.c | 1 - libnm-core/nm-setting-olpc-mesh.c | 1 - libnm-core/nm-setting-ppp.c | 2 -- libnm-core/nm-setting-pppoe.c | 1 - libnm-core/nm-setting-team-port.c | 1 - libnm-core/nm-setting-team.c | 1 - libnm-core/nm-setting-vlan.c | 1 - libnm-core/nm-setting-vpn.c | 1 - libnm-core/nm-setting-wimax.c | 1 - libnm-core/nm-setting-wired.c | 1 - libnm-core/nm-setting-wireless-security.c | 1 - libnm-core/nm-setting-wireless.c | 1 - libnm-core/nm-setting.c | 1 - libnm-core/nm-utils.c | 1 - libnm-core/nm-vpn-editor-plugin.c | 1 - libnm-core/nm-vpn-plugin-info.c | 1 - libnm-core/tests/test-crypto.c | 1 - libnm-glib/nm-device.c | 1 - libnm-glib/nm-remote-connection.c | 1 - libnm-util/crypto.c | 1 - libnm-util/crypto_gnutls.c | 2 -- libnm-util/crypto_nss.c | 2 -- libnm-util/nm-connection.c | 1 - libnm-util/nm-setting-8021x.c | 1 - libnm-util/nm-setting-adsl.c | 1 - libnm-util/nm-setting-bluetooth.c | 1 - libnm-util/nm-setting-bond.c | 1 - libnm-util/nm-setting-bridge-port.c | 1 - libnm-util/nm-setting-bridge.c | 1 - libnm-util/nm-setting-cdma.c | 1 - libnm-util/nm-setting-connection.c | 1 - libnm-util/nm-setting-dcb.c | 1 - libnm-util/nm-setting-gsm.c | 1 - libnm-util/nm-setting-infiniband.c | 1 - libnm-util/nm-setting-ip4-config.c | 1 - libnm-util/nm-setting-ip6-config.c | 1 - libnm-util/nm-setting-olpc-mesh.c | 1 - libnm-util/nm-setting-ppp.c | 2 -- libnm-util/nm-setting-pppoe.c | 1 - libnm-util/nm-setting-team-port.c | 1 - libnm-util/nm-setting-team.c | 1 - libnm-util/nm-setting-vlan.c | 1 - libnm-util/nm-setting-vpn.c | 1 - libnm-util/nm-setting-wimax.c | 1 - libnm-util/nm-setting-wired.c | 1 - libnm-util/nm-setting-wireless-security.c | 1 - libnm-util/nm-setting-wireless.c | 1 - libnm-util/nm-setting.c | 1 - libnm-util/nm-utils.c | 1 - libnm-util/tests/test-crypto.c | 1 - libnm/nm-device-adsl.c | 1 - libnm/nm-device-bond.c | 1 - libnm/nm-device-bridge.c | 1 - libnm/nm-device-bt.c | 1 - libnm/nm-device-ethernet.c | 1 - libnm/nm-device-generic.c | 1 - libnm/nm-device-infiniband.c | 1 - libnm/nm-device-modem.c | 1 - libnm/nm-device-olpc-mesh.c | 1 - libnm/nm-device-team.c | 1 - libnm/nm-device-vlan.c | 1 - libnm/nm-device-wifi.c | 1 - libnm/nm-device-wimax.c | 1 - libnm/nm-device.c | 1 - libnm/nm-manager.c | 1 - libnm/nm-object.c | 1 - libnm/nm-remote-connection.c | 1 - libnm/nm-remote-settings.c | 1 - libnm/nm-vpn-plugin-old.c | 2 -- libnm/nm-vpn-service-plugin.c | 2 -- src/NetworkManagerUtils.c | 1 - src/devices/adsl/nm-device-adsl.c | 1 - src/devices/bluetooth/nm-bluez-device.c | 1 - src/devices/bluetooth/nm-device-bt.c | 2 -- src/devices/nm-device-bond.c | 2 -- src/devices/nm-device-bridge.c | 2 -- src/devices/nm-device-ethernet-utils.c | 1 - src/devices/nm-device-ethernet.c | 1 - src/devices/nm-device-infiniband.c | 2 -- src/devices/nm-device-vlan.c | 2 -- src/devices/nm-device.c | 1 - src/devices/team/nm-device-team.c | 1 - src/devices/wifi/nm-device-olpc-mesh.c | 1 - src/devices/wifi/nm-device-wifi.c | 1 - src/devices/wifi/nm-wifi-ap-utils.c | 2 -- src/devices/wwan/nm-modem-broadband.c | 1 - src/dhcp-manager/nm-dhcp-dhclient-utils.c | 1 - src/dhcp-manager/nm-dhcp-dhclient.c | 1 - src/dhcp-manager/nm-dhcp-dhcpcd.c | 1 - src/dhcp-manager/nm-dhcp-listener.c | 1 - src/dhcp-manager/nm-dhcp-manager.c | 1 - src/dhcp-manager/nm-dhcp-systemd.c | 1 - src/dns-manager/nm-dns-dnsmasq.c | 2 -- src/dns-manager/nm-dns-manager.c | 2 -- src/main-utils.c | 1 - src/main.c | 1 - src/nm-config.c | 2 -- src/nm-iface-helper.c | 1 - src/nm-logging.c | 2 -- src/nm-manager.c | 1 - src/nm-sleep-monitor-systemd.c | 1 - src/settings/plugins/ibft/plugin.c | 1 - src/settings/plugins/ibft/reader.c | 2 -- src/settings/plugins/ifcfg-rh/plugin.c | 1 - src/settings/plugins/ifcfg-rh/reader.c | 1 - src/settings/plugins/ifnet/connection_parser.c | 1 - src/settings/plugins/ifupdown/plugin.c | 1 - 177 files changed, 232 deletions(-) diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 75422ceae9..fc716b57f7 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/clients/cli/common.c b/clients/cli/common.c index 5a3f796424..e7d7e13224 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 372f6ad1c7..9c87b5d19f 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -19,7 +19,6 @@ #include "config.h" -#include #include #include #include diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 940181384d..740e3234a3 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -25,8 +25,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-secret-agent-simple.h" #include "polkit-agent.h" diff --git a/clients/cli/general.c b/clients/cli/general.c index fa493bb849..2d2197cba1 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -22,8 +22,6 @@ #include #include -#include - #include "nm-default.h" #include "polkit-agent.h" #include "utils.h" diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index 7ad5fa1b89..bd176c8fc8 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -33,8 +33,6 @@ #include #include -#include - #include "nm-default.h" #include "polkit-agent.h" #include "nmcli.h" diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index 1120b7eb7c..0d305f74d0 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -27,8 +27,6 @@ #include #include -#include - #include "nm-default.h" #include "polkit-agent.h" #include "nm-polkit-listener.h" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index e5e6cd57cc..9460acdabc 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -22,8 +22,6 @@ #include #include -#include - #include "nm-default.h" #include "utils.h" #include "common.h" diff --git a/clients/cli/utils.c b/clients/cli/utils.c index cfc8cd2835..e3f573fba4 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -29,8 +29,6 @@ #include #include -#include - #include "nm-default.h" #include "utils.h" diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c index 5726e6506d..3f871b6323 100644 --- a/clients/common/nm-polkit-listener.c +++ b/clients/common/nm-polkit-listener.c @@ -36,7 +36,6 @@ #include #include #include -#include #include "nm-default.h" #include "nm-polkit-listener.h" diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c index 00dc965e12..6eaba275fb 100644 --- a/clients/common/nm-secret-agent-simple.c +++ b/clients/common/nm-secret-agent-simple.c @@ -32,7 +32,6 @@ #include "config.h" #include -#include #include "nm-default.h" #include "nm-secret-agent-simple.h" diff --git a/clients/nm-online.c b/clients/nm-online.c index 60e1a0a01b..b997e4a144 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -38,8 +38,6 @@ #include #include -#include - #include #include "nm-default.h" diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c index 19bd39989e..ce401e2550 100644 --- a/clients/tui/newt/nmt-newt-form.c +++ b/clients/tui/newt/nmt-newt-form.c @@ -30,8 +30,6 @@ #include #include -#include - #include "nmt-newt-form.h" #include "nmt-newt-button.h" #include "nmt-newt-grid.h" diff --git a/clients/tui/newt/nmt-newt-popup.c b/clients/tui/newt/nmt-newt-popup.c index b604eaaa39..f7813063ed 100644 --- a/clients/tui/newt/nmt-newt-popup.c +++ b/clients/tui/newt/nmt-newt-popup.c @@ -28,8 +28,6 @@ #include "config.h" -#include - #include "nmt-newt-popup.h" #include "nmt-newt-form.h" #include "nmt-newt-hacks.h" diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index b796219454..841144d8e6 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -28,8 +28,6 @@ #include #include -#include - #include "nm-default.h" #include "nmt-newt-utils.h" diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index 8f15b734b5..befc5f396e 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -27,7 +27,6 @@ #include "config.h" -#include #include #include "nm-default.h" diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c index 42873c521f..3faf3442ed 100644 --- a/clients/tui/nmt-address-list.c +++ b/clients/tui/nmt-address-list.c @@ -35,8 +35,6 @@ #include #include -#include - #include "nmt-address-list.h" #include "nmt-ip-entry.h" diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index 88502ba7c8..c21cc5be7f 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -27,7 +27,6 @@ #include "config.h" #include -#include #include diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c index 2af5e584c4..2760b1491a 100644 --- a/clients/tui/nmt-device-entry.c +++ b/clients/tui/nmt-device-entry.c @@ -40,7 +40,6 @@ #include #include -#include #include #include "nmtui.h" diff --git a/clients/tui/nmt-edit-connection-list.c b/clients/tui/nmt-edit-connection-list.c index e1b982dde9..72e8c706cd 100644 --- a/clients/tui/nmt-edit-connection-list.c +++ b/clients/tui/nmt-edit-connection-list.c @@ -26,8 +26,6 @@ #include "config.h" -#include - #include "nmtui.h" #include "nmtui-edit.h" #include "nmt-edit-connection-list.h" diff --git a/clients/tui/nmt-editor-page.c b/clients/tui/nmt-editor-page.c index a46d0ed43d..f2afc8c702 100644 --- a/clients/tui/nmt-editor-page.c +++ b/clients/tui/nmt-editor-page.c @@ -26,8 +26,6 @@ #include "config.h" -#include - #include "nmt-editor-page.h" G_DEFINE_ABSTRACT_TYPE (NmtEditorPage, nmt_editor_page, G_TYPE_OBJECT) diff --git a/clients/tui/nmt-editor-section.c b/clients/tui/nmt-editor-section.c index ff463f7fe3..b9a3ae839b 100644 --- a/clients/tui/nmt-editor-section.c +++ b/clients/tui/nmt-editor-section.c @@ -25,8 +25,6 @@ #include "config.h" -#include - #include "nmt-editor-section.h" #include "nmt-newt-toggle-button.h" diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c index 342da77d90..aaa73cbef5 100644 --- a/clients/tui/nmt-editor.c +++ b/clients/tui/nmt-editor.c @@ -27,7 +27,6 @@ #include "nmt-editor.h" -#include #include #include "nm-default.h" diff --git a/clients/tui/nmt-ip-entry.c b/clients/tui/nmt-ip-entry.c index 30c7e2e48f..d31a1f46ad 100644 --- a/clients/tui/nmt-ip-entry.c +++ b/clients/tui/nmt-ip-entry.c @@ -33,8 +33,6 @@ #include #include -#include - #include "nmt-ip-entry.h" G_DEFINE_TYPE (NmtIPEntry, nmt_ip_entry, NMT_TYPE_NEWT_ENTRY) diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index f599557aea..9f11af0a08 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -34,8 +34,6 @@ #include -#include - #include "nmt-mtu-entry.h" G_DEFINE_TYPE (NmtMtuEntry, nmt_mtu_entry, NMT_TYPE_NEWT_GRID) diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c index ef7a79ae1d..ecc9aefcf3 100644 --- a/clients/tui/nmt-page-bond.c +++ b/clients/tui/nmt-page-bond.c @@ -27,8 +27,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-bond.h" diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c index c4238fff5c..fdf4403921 100644 --- a/clients/tui/nmt-page-bridge-port.c +++ b/clients/tui/nmt-page-bridge-port.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-bridge-port.h" diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c index 042a650938..e9b0e66dc6 100644 --- a/clients/tui/nmt-page-bridge.c +++ b/clients/tui/nmt-page-bridge.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-bridge.h" diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c index 9916553d0b..2346b496be 100644 --- a/clients/tui/nmt-page-dsl.c +++ b/clients/tui/nmt-page-dsl.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-dsl.h" #include "nmt-page-ethernet.h" diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c index 433710186f..fed81f1c65 100644 --- a/clients/tui/nmt-page-ethernet.c +++ b/clients/tui/nmt-page-ethernet.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-ethernet.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c index 69ae2818ca..e10c5a7ac3 100644 --- a/clients/tui/nmt-page-infiniband.c +++ b/clients/tui/nmt-page-infiniband.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-infiniband.h" #include "nmt-mtu-entry.h" diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c index 5ec5736bbb..352fdab8b3 100644 --- a/clients/tui/nmt-page-ip4.c +++ b/clients/tui/nmt-page-ip4.c @@ -25,8 +25,6 @@ #include -#include - #include "nm-default.h" #include "nmt-page-ip4.h" #include "nmt-ip-entry.h" diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c index ea84af31c5..24678e50ec 100644 --- a/clients/tui/nmt-page-ip6.c +++ b/clients/tui/nmt-page-ip6.c @@ -25,8 +25,6 @@ #include -#include - #include "nm-default.h" #include "nmt-page-ip6.h" #include "nmt-ip-entry.h" diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c index 7c2d940a94..662ebd9c4d 100644 --- a/clients/tui/nmt-page-ppp.c +++ b/clients/tui/nmt-page-ppp.c @@ -25,8 +25,6 @@ #include -#include - #include "nm-default.h" #include "nmt-page-ppp.h" #include "nmt-newt-section.h" diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c index dfcaa15ed4..797c1cf125 100644 --- a/clients/tui/nmt-page-team-port.c +++ b/clients/tui/nmt-page-team-port.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-team-port.h" diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c index d153738ef5..572941b663 100644 --- a/clients/tui/nmt-page-team.c +++ b/clients/tui/nmt-page-team.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-page-team.h" diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c index 637987c398..d392c55235 100644 --- a/clients/tui/nmt-page-vlan.c +++ b/clients/tui/nmt-page-vlan.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nm-editor-bindings.h" diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c index 8a0c671639..c4b085ea30 100644 --- a/clients/tui/nmt-page-wifi.c +++ b/clients/tui/nmt-page-wifi.c @@ -29,8 +29,6 @@ #include -#include - #include "nm-default.h" #include "nmt-page-wifi.h" #include "nmt-mac-entry.h" diff --git a/clients/tui/nmt-password-dialog.c b/clients/tui/nmt-password-dialog.c index aeece1211f..8eeaa54896 100644 --- a/clients/tui/nmt-password-dialog.c +++ b/clients/tui/nmt-password-dialog.c @@ -26,8 +26,6 @@ #include "config.h" -#include - #include "nmt-password-dialog.h" #include "nm-secret-agent-simple.h" #include "nmtui.h" diff --git a/clients/tui/nmt-password-fields.c b/clients/tui/nmt-password-fields.c index 7ef037b9de..cba649356e 100644 --- a/clients/tui/nmt-password-fields.c +++ b/clients/tui/nmt-password-fields.c @@ -27,8 +27,6 @@ #include "config.h" -#include - #include "nmt-password-fields.h" G_DEFINE_TYPE (NmtPasswordFields, nmt_password_fields, NMT_TYPE_NEWT_GRID) diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c index 875c2c99a4..dc4d118b74 100644 --- a/clients/tui/nmt-route-editor.c +++ b/clients/tui/nmt-route-editor.c @@ -27,8 +27,6 @@ #include "config.h" -#include - #include "nm-default.h" #include "nmt-route-editor.h" #include "nmt-route-table.h" diff --git a/clients/tui/nmt-route-entry.c b/clients/tui/nmt-route-entry.c index 3a87552089..1cc99940f8 100644 --- a/clients/tui/nmt-route-entry.c +++ b/clients/tui/nmt-route-entry.c @@ -32,7 +32,6 @@ #include #include -#include #include #include "nmt-route-entry.h" diff --git a/clients/tui/nmt-route-table.c b/clients/tui/nmt-route-table.c index 523d8ee32a..0731acb6d0 100644 --- a/clients/tui/nmt-route-table.c +++ b/clients/tui/nmt-route-table.c @@ -30,7 +30,6 @@ #include #include -#include #include #include "nmt-route-table.h" diff --git a/clients/tui/nmt-slave-list.c b/clients/tui/nmt-slave-list.c index 9c8596f77c..5a9b7482eb 100644 --- a/clients/tui/nmt-slave-list.c +++ b/clients/tui/nmt-slave-list.c @@ -26,7 +26,6 @@ #include "config.h" -#include #include #include "nmt-slave-list.h" diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c index 9159ed989a..b314e146a0 100644 --- a/clients/tui/nmt-widget-list.c +++ b/clients/tui/nmt-widget-list.c @@ -37,8 +37,6 @@ #include #include -#include - #include "nmt-widget-list.h" #include "nmt-newt.h" diff --git a/clients/tui/nmtui-connect.c b/clients/tui/nmtui-connect.c index 438915d2a6..43a5cf9db1 100644 --- a/clients/tui/nmtui-connect.c +++ b/clients/tui/nmtui-connect.c @@ -28,8 +28,6 @@ #include -#include - #include "nmt-newt.h" #include "nmtui.h" diff --git a/clients/tui/nmtui-edit.c b/clients/tui/nmtui-edit.c index 0c3206da60..258b798a52 100644 --- a/clients/tui/nmtui-edit.c +++ b/clients/tui/nmtui-edit.c @@ -27,7 +27,6 @@ #include -#include #include #include "nmtui.h" diff --git a/clients/tui/nmtui-hostname.c b/clients/tui/nmtui-hostname.c index 23de95b854..f77a918b33 100644 --- a/clients/tui/nmtui-hostname.c +++ b/clients/tui/nmtui-hostname.c @@ -25,8 +25,6 @@ #include "config.h" -#include - #include "nmt-newt.h" #include "nmtui.h" diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c index d9e5142be7..20e7d02b04 100644 --- a/clients/tui/nmtui.c +++ b/clients/tui/nmtui.c @@ -30,8 +30,6 @@ #include #include -#include - #include #include "nm-default.h" diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c index 5ab22f4ef1..9b623aab08 100644 --- a/clients/tui/vpn-helpers.c +++ b/clients/tui/vpn-helpers.c @@ -32,7 +32,6 @@ #include #include -#include #include "nm-default.h" #include "vpn-helpers.h" diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c index 77bc071ce8..559ac52b61 100644 --- a/libnm-core/crypto.c +++ b/libnm-core/crypto.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "nm-default.h" #include "crypto.h" diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c index 6098b86ad1..08047bd9fb 100644 --- a/libnm-core/crypto_gnutls.c +++ b/libnm-core/crypto_gnutls.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include #include #include diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c index a1916a22c7..7f61ad7c67 100644 --- a/libnm-core/crypto_nss.c +++ b/libnm-core/crypto_nss.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include #include #include diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index fd4b57305b..5abb13abe7 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -22,7 +22,6 @@ #include "config.h" -#include #include #include "nm-default.h" #include "nm-connection.h" diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 6d75176e0e..730a0eb3ec 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include "nm-default.h" #include "nm-core-internal.h" diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c index 22141bd657..daa9c2adbf 100644 --- a/libnm-core/nm-keyfile-reader.c +++ b/libnm-core/nm-keyfile-reader.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "nm-default.h" #include "nm-core-internal.h" diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c index a2270882e3..ead1305534 100644 --- a/libnm-core/nm-keyfile-writer.c +++ b/libnm-core/nm-keyfile-writer.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "nm-default.h" #include "nm-setting.h" diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 21fa9a4986..cd0d4e664b 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-default.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c index 2e71f8e790..e3c188747f 100644 --- a/libnm-core/nm-setting-adsl.c +++ b/libnm-core/nm-setting-adsl.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-adsl.h" #include "nm-setting-ppp.h" diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c index 41a0b4c2ff..864a91ccf1 100644 --- a/libnm-core/nm-setting-bluetooth.c +++ b/libnm-core/nm-setting-bluetooth.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-bluetooth.h" #include "nm-setting-cdma.h" diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index 5441a090da..1c37758422 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "nm-setting-bond.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c index 763af37bcf..a02b8de12a 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/libnm-core/nm-setting-bridge-port.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-bridge-port.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index fe10ad69ad..7915e73072 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-bridge.h" #include "nm-connection-private.h" diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c index ecc387c8f5..3b4a046422 100644 --- a/libnm-core/nm-setting-cdma.c +++ b/libnm-core/nm-setting-cdma.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-cdma.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 21b9d80ed5..32469e5376 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-utils.h" #include "nm-utils-private.h" diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 915cc41f2e..89675810ff 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-dcb.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c index 36557a256c..4d5d7d43b3 100644 --- a/libnm-core/nm-setting-gsm.c +++ b/libnm-core/nm-setting-gsm.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-gsm.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index b0afe04f11..1cffdd79c7 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-infiniband.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 6d4441d7a6..c01f66182b 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-default.h" #include "nm-setting-ip-config.h" diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 81cc1f8889..562b760151 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-ip4-config.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 7e3ae4d4da..bb4b4c3a16 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-ip6-config.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c index c1d54bee89..56010de1a8 100644 --- a/libnm-core/nm-setting-olpc-mesh.c +++ b/libnm-core/nm-setting-olpc-mesh.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-olpc-mesh.h" #include "nm-dbus-interface.h" diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c index 01f798ea7b..2cc5a20941 100644 --- a/libnm-core/nm-setting-ppp.c +++ b/libnm-core/nm-setting-ppp.c @@ -22,8 +22,6 @@ #include "config.h" -#include - #include "nm-setting-ppp.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c index ac6764d069..e2466eb32e 100644 --- a/libnm-core/nm-setting-pppoe.c +++ b/libnm-core/nm-setting-pppoe.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-pppoe.h" #include "nm-setting-ppp.h" diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index 7fbf8620f1..78cb3cb759 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "nm-setting-team-port.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 04b98243f1..2dfffaacc5 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -22,7 +22,6 @@ #include #include -#include #include "nm-setting-team.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index d904ad52df..dd3746a83d 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -23,7 +23,6 @@ #include #include -#include #include "nm-setting-vlan.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index e6fffa8797..50385112e9 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-vpn.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c index 0287cdc19a..95a099522b 100644 --- a/libnm-core/nm-setting-wimax.c +++ b/libnm-core/nm-setting-wimax.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-wimax.h" #include "nm-setting-private.h" diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index d381f95d62..0a92f8e849 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-wired.h" #include "nm-utils.h" diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index 6df5b46176..df2190bc28 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index c5365c9ab7..6851bf509b 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-wireless.h" #include "nm-dbus-interface.h" diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index f9dee4730d..739e3ba2d1 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-default.h" #include "nm-setting.h" diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 6b6a35d543..ce41f1bc2a 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -29,7 +29,6 @@ #include #include #include -#include #include #include "nm-default.h" diff --git a/libnm-core/nm-vpn-editor-plugin.c b/libnm-core/nm-vpn-editor-plugin.c index 5f86df8c74..fd79fd3bcd 100644 --- a/libnm-core/nm-vpn-editor-plugin.c +++ b/libnm-core/nm-vpn-editor-plugin.c @@ -25,7 +25,6 @@ #include "nm-vpn-editor-plugin.h" #include -#include #include "nm-macros-internal.h" #include "gsystem-local-alloc.h" diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c index 4f057d3c48..fde258df8c 100644 --- a/libnm-core/nm-vpn-plugin-info.c +++ b/libnm-core/nm-vpn-plugin-info.c @@ -23,7 +23,6 @@ #include "nm-vpn-plugin-info.h" #include -#include #include #include #include diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index 0d68653fc0..926cddb08c 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 2363167168..ccb1c1f2cb 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -23,7 +23,6 @@ #include -#include #include #include "nm-default.h" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index ce750ef3eb..1bc545d555 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index fccf05d1a6..757fdbe014 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "nm-default.h" #include "crypto.h" diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index 1ff55e91b8..4e3e4e7cd7 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include #include #include diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index 222c55d2dd..b71806dd2d 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -23,8 +23,6 @@ #include "config.h" -#include - #include #include #include diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 0753fd1381..884ed2e12c 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -22,7 +22,6 @@ #include "config.h" -#include #include #include #include "nm-default.h" diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 678d70ab71..30febf9ce1 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-8021x.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c index 5355011cd1..c97d0a63c2 100644 --- a/libnm-util/nm-setting-adsl.c +++ b/libnm-util/nm-setting-adsl.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-adsl.h" #include "nm-setting-ppp.h" diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c index 2867d73bae..76bf283145 100644 --- a/libnm-util/nm-setting-bluetooth.c +++ b/libnm-util/nm-setting-bluetooth.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-param-spec-specialized.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index fa12cf0ea1..c6e860bdc5 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "nm-setting-bond.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index b3afa50050..9da2192582 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "nm-setting-bridge-port.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index bdaa75f977..1e475d305e 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -25,7 +25,6 @@ #include #include #include -#include #include #include "nm-setting-bridge.h" diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c index 53f886ece3..38f0fedb08 100644 --- a/libnm-util/nm-setting-cdma.c +++ b/libnm-util/nm-setting-cdma.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include "nm-setting-cdma.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index bda89d6323..abbe99ba3d 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-utils.h" #include "nm-dbus-glib-types.h" diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index 89ee387852..da3febaabe 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -23,7 +23,6 @@ #include #include -#include #include "nm-setting-dcb.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index e422c92e61..bc9f31bcfb 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-gsm.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index 1036702fec..95fa0c6920 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-infiniband.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 9c6a76bb06..707cd48ba6 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-default.h" #include "nm-setting-ip4-config.h" diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 1d91648348..49bd3cc6df 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -23,7 +23,6 @@ #include #include -#include #include "nm-default.h" #include "nm-setting-ip6-config.h" diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c index e4b6dae5b6..8d812869c7 100644 --- a/libnm-util/nm-setting-olpc-mesh.c +++ b/libnm-util/nm-setting-olpc-mesh.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "NetworkManager.h" #include "nm-setting-olpc-mesh.h" diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c index a01d3e106f..06f220fe35 100644 --- a/libnm-util/nm-setting-ppp.c +++ b/libnm-util/nm-setting-ppp.c @@ -22,8 +22,6 @@ #include "config.h" -#include - #include "nm-setting-ppp.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c index deaeb2e883..5747d30654 100644 --- a/libnm-util/nm-setting-pppoe.c +++ b/libnm-util/nm-setting-pppoe.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting-pppoe.h" #include "nm-setting-ppp.h" diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index 9992f58a28..7e17d5e3b5 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-team-port.h" #include "nm-utils.h" diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index 19bc959652..0753150351 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "nm-setting-team.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 43b6a91c13..52676d47f0 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -24,7 +24,6 @@ #include #include #include -#include #include "nm-setting-vlan.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 1feeb588a0..95f08adffe 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "nm-setting-vpn.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c index 37f402f69f..7581f2f295 100644 --- a/libnm-util/nm-setting-wimax.c +++ b/libnm-util/nm-setting-wimax.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "nm-setting-wimax.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index aba5fb9831..5233fc5360 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "nm-setting-wired.h" #include "nm-param-spec-specialized.h" diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 574ff3bd52..719dfaa6ef 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -24,7 +24,6 @@ #include #include -#include #include "nm-setting-wireless-security.h" #include "nm-setting-8021x.h" diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index 84f1c77c72..2720f4af80 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "NetworkManager.h" #include "nm-setting-wireless.h" diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c index 39c1d22207..372b06b526 100644 --- a/libnm-util/nm-setting.c +++ b/libnm-util/nm-setting.c @@ -23,7 +23,6 @@ #include "config.h" #include -#include #include "nm-setting.h" #include "nm-setting-private.h" diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index c4cc4cf212..ab19f2a68d 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "nm-default.h" #include "nm-utils.h" diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c index baf0cf45a8..5a8c4eb0ba 100644 --- a/libnm-util/tests/test-crypto.c +++ b/libnm-util/tests/test-crypto.c @@ -25,7 +25,6 @@ #include #include -#include #include #include diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c index 99771548f8..b9d609dab5 100644 --- a/libnm/nm-device-adsl.c +++ b/libnm/nm-device-adsl.c @@ -29,7 +29,6 @@ #include "nm-setting-connection.h" #include -#include G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index f36b761f31..3bfcb94cea 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c index 4ebcec3f56..5afc46e3ed 100644 --- a/libnm/nm-device-bridge.c +++ b/libnm/nm-device-bridge.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c index 1a0ecb98fa..f89be17221 100644 --- a/libnm/nm-device-bt.c +++ b/libnm/nm-device-bt.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c index ac18d30ac7..b0f710f8a2 100644 --- a/libnm/nm-device-ethernet.c +++ b/libnm/nm-device-ethernet.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c index 3ed0fa7e63..9aeb9bfafb 100644 --- a/libnm/nm-device-generic.c +++ b/libnm/nm-device-generic.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include "nm-device-generic.h" #include "nm-device-private.h" diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c index c59dd0f100..ab3a0bb75d 100644 --- a/libnm/nm-device-infiniband.c +++ b/libnm/nm-device-infiniband.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c index e62b10b5f4..9fe5acb650 100644 --- a/libnm/nm-device-modem.c +++ b/libnm/nm-device-modem.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c index 1cf3c33ebd..8e6cb1ab24 100644 --- a/libnm/nm-device-olpc-mesh.c +++ b/libnm/nm-device-olpc-mesh.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c index 540786cd96..c38c58c1fd 100644 --- a/libnm/nm-device-team.c +++ b/libnm/nm-device-team.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c index 0b95450ad7..b285eea9c6 100644 --- a/libnm/nm-device-vlan.c +++ b/libnm/nm-device-vlan.c @@ -21,7 +21,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c index a6a717ffd6..644a89004f 100644 --- a/libnm/nm-device-wifi.c +++ b/libnm/nm-device-wifi.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c index bc2337a9a6..55658a590e 100644 --- a/libnm/nm-device-wimax.c +++ b/libnm/nm-device-wimax.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-device.c b/libnm/nm-device.c index 5a23fab292..a792d0954a 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -23,7 +23,6 @@ #include -#include #include #include "nm-default.h" diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index 25ab1f8a24..c0d026291a 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include "nm-default.h" diff --git a/libnm/nm-object.c b/libnm/nm-object.c index 9d6bde9d4b..2aaa4d9d96 100644 --- a/libnm/nm-object.c +++ b/libnm/nm-object.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include #include diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c index 83da4f9ec6..e2073784ca 100644 --- a/libnm/nm-remote-connection.c +++ b/libnm/nm-remote-connection.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c index 999859ccbd..4d240e3b38 100644 --- a/libnm/nm-remote-settings.c +++ b/libnm/nm-remote-settings.c @@ -22,7 +22,6 @@ #include "config.h" #include -#include #include #include diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c index a98cd43625..197bb4561a 100644 --- a/libnm/nm-vpn-plugin-old.c +++ b/libnm/nm-vpn-plugin-old.c @@ -25,8 +25,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-vpn-plugin-old.h" #include "nm-enum-types.h" diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 1f25be6e82..b3b2558696 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -27,8 +27,6 @@ #include #include -#include - #include "nm-glib.h" #include "nm-enum-types.h" #include "nm-utils.h" diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index d8e5fed1bd..8f24ee0489 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c index 34390282d7..19b970d791 100644 --- a/src/devices/adsl/nm-device-adsl.c +++ b/src/devices/adsl/nm-device-adsl.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c index ba021797ea..cc44b9ed02 100644 --- a/src/devices/bluetooth/nm-bluez-device.c +++ b/src/devices/bluetooth/nm-bluez-device.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include "nm-default.h" diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index f0c94f8fd3..05b1d4e7fd 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -23,8 +23,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-bluez-common.h" #include "nm-bluez-device.h" diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c index 822062ae12..3d2795fced 100644 --- a/src/devices/nm-device-bond.c +++ b/src/devices/nm-device-bond.c @@ -20,8 +20,6 @@ #include "config.h" -#include - #include #include diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c index a1fbc60970..d182d872fe 100644 --- a/src/devices/nm-device-bridge.c +++ b/src/devices/nm-device-bridge.c @@ -20,8 +20,6 @@ #include "config.h" -#include - #include #include "nm-default.h" diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c index 886edf4473..9165de31ff 100644 --- a/src/devices/nm-device-ethernet-utils.c +++ b/src/devices/nm-device-ethernet-utils.c @@ -19,7 +19,6 @@ #include "config.h" #include -#include #include #include "nm-default.h" diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index fc49fd1b69..5f43a10dcf 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c index a3fcd75418..f52613b069 100644 --- a/src/devices/nm-device-infiniband.c +++ b/src/devices/nm-device-infiniband.c @@ -20,8 +20,6 @@ #include "config.h" -#include - #include #include "nm-default.h" diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c index defa3b81a3..584d844e15 100644 --- a/src/devices/nm-device-vlan.c +++ b/src/devices/nm-device-vlan.c @@ -20,8 +20,6 @@ #include "config.h" -#include - #include #include "nm-default.h" diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index c2c8690d53..78c9e14a43 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c index 5b5b760e00..626f808d60 100644 --- a/src/devices/team/nm-device-team.c +++ b/src/devices/team/nm-device-team.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c index 7e37a2cf81..2718e20612 100644 --- a/src/devices/wifi/nm-device-olpc-mesh.c +++ b/src/devices/wifi/nm-device-olpc-mesh.c @@ -26,7 +26,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 42326d5192..74ba055038 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -21,7 +21,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c index d8b87d2369..2732eb9917 100644 --- a/src/devices/wifi/nm-wifi-ap-utils.c +++ b/src/devices/wifi/nm-wifi-ap-utils.c @@ -23,8 +23,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-wifi-ap-utils.h" #include "nm-utils.h" diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c index fc782481fd..e5c77f4dcf 100644 --- a/src/devices/wwan/nm-modem-broadband.c +++ b/src/devices/wwan/nm-modem-broadband.c @@ -20,7 +20,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c index 3456ce7df3..a86596c077 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c +++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c @@ -19,7 +19,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 4fcba5ce6a..92180903ac 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -24,7 +24,6 @@ #include #undef _XOPEN_SOURCE -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c index 955e616061..ff6c568429 100644 --- a/src/dhcp-manager/nm-dhcp-dhcpcd.c +++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c @@ -23,7 +23,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c index 1fb8e361c8..6fa53ff3e6 100644 --- a/src/dhcp-manager/nm-dhcp-listener.c +++ b/src/dhcp-manager/nm-dhcp-listener.c @@ -19,7 +19,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index f7ccc01c4c..bea7032517 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -22,7 +22,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 6fc8b6ef1c..dc4c9be321 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -18,7 +18,6 @@ #include "config.h" -#include #include #include #include diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c index 62c581e1a4..59a341aa9a 100644 --- a/src/dns-manager/nm-dns-dnsmasq.c +++ b/src/dns-manager/nm-dns-dnsmasq.c @@ -27,8 +27,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-dns-dnsmasq.h" #include "nm-utils.h" diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 13b41856f1..f1acff1f27 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -35,8 +35,6 @@ #include -#include - #include "nm-default.h" #include "nm-utils.h" #include "nm-core-internal.h" diff --git a/src/main-utils.c b/src/main-utils.c index 1c24f405ab..76dbc1500d 100644 --- a/src/main-utils.c +++ b/src/main-utils.c @@ -29,7 +29,6 @@ #include #include -#include #include #include diff --git a/src/main.c b/src/main.c index 14a9c46757..a8e8805040 100644 --- a/src/main.c +++ b/src/main.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include diff --git a/src/nm-config.c b/src/nm-config.c index 24cca2b7fe..d805948946 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -24,8 +24,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-config.h" #include "nm-utils.h" diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c index 07b3d34855..6b1710f670 100644 --- a/src/nm-iface-helper.c +++ b/src/nm-iface-helper.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/src/nm-logging.c b/src/nm-logging.c index b74f1a0ee9..f79ba3c2e4 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -32,8 +32,6 @@ #include #include -#include - #if SYSTEMD_JOURNAL #define SD_JOURNAL_SUPPRESS_LOCATION #include diff --git a/src/nm-manager.c b/src/nm-manager.c index 224f084649..b24b592317 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -28,7 +28,6 @@ #include #include #include -#include #include "nm-default.h" #include "nm-manager.h" diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c index 620cf93524..5748cba983 100644 --- a/src/nm-sleep-monitor-systemd.c +++ b/src/nm-sleep-monitor-systemd.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include "nm-default.h" diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c index feb02dde1e..944209285b 100644 --- a/src/settings/plugins/ibft/plugin.c +++ b/src/settings/plugins/ibft/plugin.c @@ -25,7 +25,6 @@ #include #include -#include #include diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c index 81c83a6f6a..195c264186 100644 --- a/src/settings/plugins/ibft/reader.c +++ b/src/settings/plugins/ibft/reader.c @@ -31,8 +31,6 @@ #include #include -#include - #include "nm-default.h" #include "nm-core-internal.h" #include "nm-platform.h" diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c index c35192492d..7e54833c91 100644 --- a/src/settings/plugins/ifcfg-rh/plugin.c +++ b/src/settings/plugins/ifcfg-rh/plugin.c @@ -30,7 +30,6 @@ #include #include -#include #include #include diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c index 41fe18d052..b05c3eca8e 100644 --- a/src/settings/plugins/ifcfg-rh/reader.c +++ b/src/settings/plugins/ifcfg-rh/reader.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c index 619eb3e5de..437629c58c 100644 --- a/src/settings/plugins/ifnet/connection_parser.c +++ b/src/settings/plugins/ifnet/connection_parser.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "nm-system-config-interface.h" #include "nm-default.h" diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c index 6e676cac2b..ff2f94d255 100644 --- a/src/settings/plugins/ifupdown/plugin.c +++ b/src/settings/plugins/ifupdown/plugin.c @@ -27,7 +27,6 @@ #include #include -#include #include #include "nm-default.h"