diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-07-17 14:38:54 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-05 15:32:40 +0200 |
| commit | 19c3ea948a7c74774621baf62d68cb4826e1b97c (patch) | |
| tree | bb6300533ff66d0864b3e91935e3320786d2850e /src | |
| parent | 9ac57182ca2a551f2c7dafa331b8daf74dc78e1c (diff) | |
| download | NetworkManager-19c3ea948a7c74774621baf62d68cb4826e1b97c.tar.gz | |
all: make use of new header file "nm-default.h"
Diffstat (limited to 'src')
237 files changed, 241 insertions, 384 deletions
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 <linux/if.h> #include <linux/if_infiniband.h> -#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 <stdio.h> #include <arpa/inet.h> -#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 <gudev/gudev.h> #include <gmodule.h> -#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 <stdlib.h> #include <string.h> -#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 <glib/gi18n.h> #include <string.h> -#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 <stdlib.h> #include <gmodule.h> -#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 <string.h> -#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 <string.h> #include <stdlib.h> -#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 <string.h> #include <stdlib.h> -#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 <glib/gi18n.h> -#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 <errno.h> #include <stdlib.h> -#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 <stdlib.h> -#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 <glib/gi18n.h> #include <nm-connection.h> -#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 <gudev/gudev.h> -#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 <gmodule.h> #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 <linux/if_infiniband.h> -#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 <sys/socket.h> -#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 <fcntl.h> #include <netlink/route/addr.h> -#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 <teamdctl.h> #include <stdlib.h> -#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 <sys/ioctl.h> #include <errno.h> -#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 <unistd.h> #include <errno.h> -#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 <glib/gi18n.h> +#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 <string.h> #include <stdlib.h> -#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 <string.h> -#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 <string.h> -#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 <libmm-glib.h> #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 <stdlib.h> #include <uuid/uuid.h> -#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 <nm-ip4-config.h> #include <nm-ip6-config.h> -#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 <ctype.h> #include <arpa/inet.h> -#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 <nm-setting-ip4-config.h> #include <nm-setting-ip6-config.h> -#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 <arpa/inet.h> #include <ctype.h> -#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 <netinet/in.h> #include <arpa/inet.h> -#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 <string.h> #include <signal.h> -#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 <errno.h> #include <unistd.h> -#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 <fcntl.h> #include <stdio.h> -#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 <ctype.h> #include <net/if_arp.h> -#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 <unistd.h> #include <arpa/inet.h> -#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 <nm-ip4-config.h> #include <nm-ip6-config.h> -#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 <unistd.h> #include <arpa/inet.h> -#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 <nm-utils.h> -#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 <glib/gi18n.h> -#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 <glib/gi18n.h> -#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 <sys/types.h> #include <sys/wait.h> -#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 <arpa/inet.h> #include <stdlib.h> -#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 <arpa/inet.h> -#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 <glib-unix.h> #include <gmodule.h> -#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 <string.h> #include <sys/resource.h> -#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 <sys/wait.h> #include <unistd.h> -#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 <string.h> #include <stdlib.h> -#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 <dbus/dbus.h> #include <dbus/dbus-glib.h> -#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 <string.h> -#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 <dbus/dbus-glib.h> #include <nm-connection.h> -#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 <sys/types.h> #include <errno.h> -#include "nm-glib.h" +#include "nm-default.h" #include "nm-dbus-interface.h" #include "nm-bus-manager.h" @@ -34,7 +34,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> #include <string.h> -#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 <dbus/dbus.h> #include <dbus/dbus-glib.h> -#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 <string.h> #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 <glib/gi18n.h> -#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 <nm-connection.h> -#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 <sys/wait.h> #include <string.h> -#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 <string.h> -#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 <string.h> -#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 <string.h> #include <errno.h> -#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 <stdio.h> -#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 <dbus/dbus-glib.h> -#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 <string.h> -#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 <string.h> #include <arpa/inet.h> -#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 <systemd/sd-journal.h> #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 <dbus/dbus-glib.h> #include <glib/gi18n.h> -#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 <string.h> 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 <netdb.h> -#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 <gudev/gudev.h> #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 <string.h> #include <sys/stat.h> -#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 <glib/gi18n.h> #include <gio/gunixfdlist.h> -#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 <errno.h> #include <string.h> #include <sys/stat.h> -#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 <netinet/in.h> #include <linux/rtnetlink.h> -#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 <linux/mii.h> #include <linux/version.h> -#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 <netlink/route/addr.h> #include <netlink/route/rtnl.h> -#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 <linux/if_addr.h> #include <nm-dbus-interface.h> -#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 <stdlib.h> #include <syslog.h> -#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 <arpa/inet.h> #include <netlink/route/addr.h> -#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 <string.h> #include <arpa/inet.h> -#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 <linux/rtnetlink.h> #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 <linux/nl80211.h> -#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 <math.h> -#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 <stdio.h> #include <string.h> -#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 <net/ethernet.h> -#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 <linux/if.h> #include <linux/if_ppp.h> -#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 <pppd/eui64.h> #include <pppd/ipv6cp.h> -#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 <stdlib.h> #include <netinet/in.h> -#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 <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#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 <sys/inotify.h> #include <errno.h> -#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 <sys/inotify.h> -#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 <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#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 <nm-connection.h> -#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 <nm-dbus-interface.h> #include <dbus/dbus-glib-lowlevel.h> -#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 <nm-connection.h> -#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 <selinux/selinux.h> #endif -#include "gsystem-local-alloc.h" #include <nm-dbus-interface.h> #include <nm-connection.h> #include <nm-setting-8021x.h> @@ -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 <nm-connection.h> -#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 <nm-setting-connection.h> -#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 <glib/gi18n.h> -#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 <nm-connection.h> -#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 <nm-setting-wireless-security.h> #include <nm-setting-8021x.h> #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 <nm-setting-connection.h> -#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 <nm-setting-bridge-port.h> #include <nm-setting-dcb.h> #include <nm-setting-generic.h> -#include "nm-glib.h" +#include "nm-default.h" #include "nm-core-internal.h" #include <nm-utils.h> #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 <nm-connection.h> -#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 <stdlib.h> #include <string.h> -#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 <nm-connection.h> -#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 <nm-connection.h> -#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 <glib/gi18n.h> #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 <unistd.h> #include <nm-system-config-interface.h> -#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 <nm-utils.h> #include "NetworkManagerUtils.h" #include <nm-system-config-interface.h> -#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 <arpa/inet.h> #include <nm-setting-ip6-config.h> #include <nm-setting-ip4-config.h> -#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 <nm-setting-wireless-security.h> #include <nm-settings-connection.h> #include <nm-system-config-interface.h> -#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 <nm-utils.h> #include <nm-setting-connection.h> -#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 <unistd.h> #include <nm-utils.h> -#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 <string.h> #include <stdlib.h> #include <nm-system-config-interface.h> -#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 <wordexp.h> #include <libgen.h> #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 <nm-setting-wireless-security.h> #include <nm-settings-connection.h> #include <nm-system-config-interface.h> -#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 <nm-settings-connection.h> -#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 <glib/gi18n.h> #include <nm-setting-connection.h> -#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 <arpa/inet.h> 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 <string.h> -#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 <nm-setting-connection.h> #include <nm-utils.h> +#include "nm-default.h" #include "nm-system-config-interface.h" #include "nm-dbus-glib-types.h" #include "nm-keyfile-connection.h" @@ -34,7 +35,6 @@ #include "writer.h" #include "common.h" #include "utils.h" -#include "gsystem-local-alloc.h" #include "nm-logging.h" G_DEFINE_TYPE (NMKeyfileConnection, nm_keyfile_connection, NM_TYPE_SETTINGS_CONNECTION) diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index 98c4fc513d..467cbdbf0e 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -34,8 +34,7 @@ #include <nm-setting-connection.h> #include <nm-utils.h> #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 <nm-connection.h> -#include "nm-glib.h" +#include "nm-default.h" NMConnection *nm_keyfile_plugin_connection_from_file (const char *filename, GError **error); diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c index 28e9eb447f..375f0d8383 100644 --- a/src/settings/plugins/keyfile/tests/test-keyfile.c +++ b/src/settings/plugins/keyfile/tests/test-keyfile.c @@ -29,7 +29,7 @@ #include <sys/socket.h> #include "nm-core-internal.h" -#include "nm-logging.h" +#include "nm-default.h" #include "reader.h" #include "writer.h" diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c index 1685e22b53..4300b0dcb4 100644 --- a/src/settings/plugins/keyfile/utils.c +++ b/src/settings/plugins/keyfile/utils.c @@ -22,8 +22,7 @@ #include <stdlib.h> #include <string.h> -#include "nm-glib.h" -#include "gsystem-local-alloc.h" +#include "nm-default.h" #include "utils.h" #include <nm-setting-wired.h> #include <nm-setting-wireless.h> diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h index a4c136500b..427cd5f64d 100644 --- a/src/settings/plugins/keyfile/utils.h +++ b/src/settings/plugins/keyfile/utils.h @@ -21,7 +21,7 @@ #ifndef _UTILS_H_ #define _UTILS_H_ -#include "nm-glib.h" +#include "nm-default.h" #include "NetworkManagerUtils.h" #define NM_KEYFILE_CONNECTION_LOG_PATH(path) str_if_set (path,"in-memory") diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index d5c087d2f7..d3c292bdcf 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -27,13 +27,11 @@ #include <errno.h> #include <string.h> -#include "nm-glib.h" -#include "nm-logging.h" +#include "nm-default.h" #include "writer.h" #include "common.h" #include "utils.h" #include "nm-keyfile-internal.h" -#include "gsystem-local-alloc.h" typedef struct { const char *keyfile_dir; diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h index e7bb346c20..25f44e941e 100644 --- a/src/settings/plugins/keyfile/writer.h +++ b/src/settings/plugins/keyfile/writer.h @@ -24,7 +24,7 @@ #include <nm-connection.h> -#include "nm-glib.h" +#include "nm-default.h" gboolean nm_keyfile_plugin_write_connection (NMConnection *connection, const char *existing_path, 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 <stdlib.h> #include <dbus/dbus-glib.h> -#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 <nm-setting-wireless.h> #include <nm-setting-wireless-security.h> #include <nm-setting-8021x.h> -#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 <stdio.h> #include <string.h> -#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 <string.h> #include <dbus/dbus.h> -#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 <string.h> #include <errno.h> -#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 <net/if_arp.h> #include <sys/resource.h> -#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 <string.h> -#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 <sys/types.h> #include <sys/wait.h> -#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 <string.h> #include <errno.h> -#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 <string.h> #include <arpa/inet.h> -#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 <string.h> #include <arpa/inet.h> -#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 <string.h> #include <arpa/inet.h> -#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 <arpa/inet.h> #include <linux/rtnetlink.h> -#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 <nm-simple-connection.h> #include <nm-setting-connection.h> -#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 <errno.h> #include <stdlib.h> -#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 <string.h> -#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 <signal.h> #include <unistd.h> -#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" |