diff options
Diffstat (limited to 'src/devices')
51 files changed, 51 insertions, 77 deletions
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c index 1718cdd8d..6a33d21b1 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 16dc332e1..fe0bc14c4 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 a557a0c88..34390282d 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 74e29d5dd..3587bfc75 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 39afd091a..ba021797e 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 01052c8d6..0e54fcb06 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 ed424bd2f..7550d4ed8 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 97b9ac66c..1f5597d83 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 e02e72095..04ae833ae 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 98d19b22e..a8a2bfb4d 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 9df80bf15..c5ba120c6 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 e5f526461..f6bf76586 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 a97eaa770..9ec6a089f 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 bc2f6c7aa..c59cbb80f 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 ceb8d484d..c9f5828df 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 faf6ce669..ae5512f89 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 11aabbdb5..9c35d8b63 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 55b8d0aef..f0c94f8fd 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 b352e513d..822062ae1 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 b031a43e3..a1fbc6097 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 e30c48c2d..1d0bf7ca0 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 7c226f065..886edf447 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 1ca181b2b..31d645d85 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 6caea4974..fc49fd1b6 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 7f2468bd0..bf3f25c60 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 47169897b..c26190ab5 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 ce531655b..a3fcd7541 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 acca32e55..7b8598d82 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 51d75b5bc..6f331571c 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 c4e3fe0de..33f51bfb6 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 e2af6b279..6c6ed5211 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 1a3a65443..c4666a217 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 d89bf625b..defa3b81a 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 4f46f6aa8..68dbd952a 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 46d90cfa7..c2c8690d5 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 9e0dcac71..8c26d161f 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 145b854f6..5b5b760e0 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 949e01d15..859178249 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 35cee90e1..9049478dc 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 f7fffd272..7e37a2cf8 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 ed7a40246..42326d519 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 9ac7052e9..d8b87d236 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 7166e1f8b..6502e8832 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 b7323b845..9b0092c3d 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 bd115b429..9fdcef46e 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 2c07b36f6..fc782481f 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 92ac0a189..c472bc420 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 b74d72c0e..be35ffd31 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 0889f7231..35b80ba15 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 863c5828f..479b5a94c 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 fc85a92ca..78031e60f 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)) |