diff options
Diffstat (limited to 'libnm-glib')
37 files changed, 89 insertions, 114 deletions
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c index 9c8085d371..c3c0ff19c3 100644 --- a/libnm-glib/libnm-glib-test.c +++ b/libnm-glib/libnm-glib-test.c @@ -20,18 +20,15 @@ * Copyright (C) 2007 - 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdlib.h> #include <signal.h> #include <string.h> - #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> - -#include "nm-default.h" #include "nm-client.h" #include "nm-device.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c index 09d9bea9b1..ec25a2d974 100644 --- a/libnm-glib/libnm_glib.c +++ b/libnm-glib/libnm_glib.c @@ -21,14 +21,14 @@ * Copyright (C) 2005 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" + #include "NetworkManager.h" #include "libnm_glib.h" diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c index 3a420ea14a..5f34cb292c 100644 --- a/libnm-glib/nm-access-point.c +++ b/libnm-glib/nm-access-point.c @@ -19,7 +19,7 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> @@ -30,7 +30,6 @@ #include <nm-setting-wireless-security.h> #include <nm-utils.h> -#include "nm-default.h" #include "nm-access-point.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c index 539eb75f8e..db6e7ab732 100644 --- a/libnm-glib/nm-active-connection.c +++ b/libnm-glib/nm-active-connection.c @@ -19,11 +19,10 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-active-connection.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 61223e2a4a..fc105e53e7 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -19,14 +19,14 @@ * Copyright 2007 - 2013 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-client.h" #include <dbus/dbus-glib.h> #include <string.h> -#include <nm-utils.h> + +#include "nm-utils.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c index db75eb24ea..539dabb970 100644 --- a/libnm-glib/nm-dbus-helpers.c +++ b/libnm-glib/nm-dbus-helpers.c @@ -18,12 +18,12 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" + #include "nm-dbus-helpers-private.h" #include "NetworkManager.h" diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c index 6812168370..b8d341f452 100644 --- a/libnm-glib/nm-device-adsl.c +++ b/libnm-glib/nm-device-adsl.c @@ -19,16 +19,17 @@ * Copyright 2009 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-device-adsl.h" + +#include <string.h> + #include "nm-device-private.h" #include "nm-object-private.h" #include "nm-setting-adsl.h" -#include <string.h> - G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE) #define NM_DEVICE_ADSL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_ADSL, NMDeviceAdslPrivate)) diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index 12df490f0e..2ba34162bd 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bond.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bond.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bond.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index d08104d10b..d95a21194d 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bridge.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-bridge.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-bridge.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c index 3d7d183b08..5f6a12f5fe 100644 --- a/libnm-glib/nm-device-bt.c +++ b/libnm-glib/nm-device-bt.c @@ -19,15 +19,14 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-bluetooth.h> +#include "nm-setting-connection.h" +#include "nm-setting-bluetooth.h" -#include "nm-default.h" #include "nm-device-bt.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c index b591461636..46056a2c7b 100644 --- a/libnm-glib/nm-device-ethernet.c +++ b/libnm-glib/nm-device-ethernet.c @@ -19,16 +19,15 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wired.h> -#include <nm-setting-pppoe.h> +#include "nm-setting-connection.h" +#include "nm-setting-wired.h" +#include "nm-setting-pppoe.h" -#include "nm-default.h" #include "nm-device-ethernet.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c index a7b2fa04dd..dd9c24b5c9 100644 --- a/libnm-glib/nm-device-generic.c +++ b/libnm-glib/nm-device-generic.c @@ -18,7 +18,7 @@ * Copyright 2013 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c index b9af88794a..c256c4a1ca 100644 --- a/libnm-glib/nm-device-infiniband.c +++ b/libnm-glib/nm-device-infiniband.c @@ -18,17 +18,16 @@ * Copyright 2011 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <linux/if_infiniband.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-infiniband.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-infiniband.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-infiniband.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c index 88c15dd798..96ce6ca098 100644 --- a/libnm-glib/nm-device-modem.c +++ b/libnm-glib/nm-device-modem.c @@ -19,15 +19,14 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-gsm.h> -#include <nm-setting-cdma.h> +#include "nm-setting-connection.h" +#include "nm-setting-gsm.h" +#include "nm-setting-cdma.h" -#include "nm-default.h" #include "nm-device-modem.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c index 69acce4578..846b4c51be 100644 --- a/libnm-glib/nm-device-olpc-mesh.c +++ b/libnm-glib/nm-device-olpc-mesh.c @@ -18,14 +18,13 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-connection.h> -#include <nm-setting-olpc-mesh.h> +#include "nm-setting-connection.h" +#include "nm-setting-olpc-mesh.h" -#include "nm-default.h" #include "nm-device-olpc-mesh.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c index e7622962e4..7b50e1852a 100644 --- a/libnm-glib/nm-device-team.c +++ b/libnm-glib/nm-device-team.c @@ -18,16 +18,15 @@ * Copyright 2013 Jiri Pirko <jiri@resnulli.us> */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-team.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-team.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-team.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c index fe3db03a22..28d8ce5761 100644 --- a/libnm-glib/nm-device-vlan.c +++ b/libnm-glib/nm-device-vlan.c @@ -18,16 +18,15 @@ * Copyright 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-vlan.h> -#include <nm-utils.h> +#include "nm-setting-connection.h" +#include "nm-setting-vlan.h" +#include "nm-utils.h" -#include "nm-default.h" #include "nm-device-vlan.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c index 05b47b4da6..2c12628a9d 100644 --- a/libnm-glib/nm-device-wifi.c +++ b/libnm-glib/nm-device-wifi.c @@ -19,16 +19,15 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wireless.h> -#include <nm-setting-wireless-security.h> +#include "nm-setting-connection.h" +#include "nm-setting-wireless.h" +#include "nm-setting-wireless-security.h" -#include "nm-default.h" #include "nm-device-wifi.h" #include "nm-device-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c index 70c8b14e3c..9bd733e7fd 100644 --- a/libnm-glib/nm-device-wimax.c +++ b/libnm-glib/nm-device-wimax.c @@ -19,15 +19,14 @@ * Copyright 2009 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <netinet/ether.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" -#include "nm-default.h" #include "nm-device-wimax.h" #include "nm-object-private.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index b1f8cfb203..377784b82d 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -19,13 +19,11 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> - #include <gudev/gudev.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c index 5847937426..fc3491c890 100644 --- a/libnm-glib/nm-dhcp4-config.c +++ b/libnm-glib/nm-dhcp4-config.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c index e55c14166e..43aee15c7c 100644 --- a/libnm-glib/nm-dhcp6-config.c +++ b/libnm-glib/nm-dhcp6-config.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c index ffaef74163..ae7448f9fd 100644 --- a/libnm-glib/nm-ip4-config.c +++ b/libnm-glib/nm-ip4-config.c @@ -19,11 +19,11 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-ip4-config.h> +#include "nm-setting-ip4-config.h" #include "nm-ip4-config.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c index d44056a1cf..320f00f2d0 100644 --- a/libnm-glib/nm-ip6-config.c +++ b/libnm-glib/nm-ip6-config.c @@ -19,11 +19,11 @@ * Copyright 2008 - 2014 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-setting-ip6-config.h> +#include "nm-setting-ip6-config.h" #include "nm-ip6-config.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c index 82af1140f1..fa56ace53b 100644 --- a/libnm-glib/nm-object-cache.c +++ b/libnm-glib/nm-object-cache.c @@ -18,10 +18,10 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" + #include "nm-object-cache.h" #include "nm-object.h" diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index f2f46e0118..b252dc7a6d 100644 --- a/libnm-glib/nm-object.c +++ b/libnm-glib/nm-object.c @@ -19,13 +19,13 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <stdlib.h> #include <stdio.h> -#include <nm-utils.h> -#include "nm-default.h" + +#include "nm-utils.h" #include "NetworkManager.h" #include "nm-object.h" #include "nm-object-cache.h" diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c index 4298129bc0..2031b27f11 100644 --- a/libnm-glib/nm-remote-connection.c +++ b/libnm-glib/nm-remote-connection.c @@ -19,14 +19,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> -#include <nm-utils.h> -#include <nm-setting-connection.h> -#include "nm-default.h" +#include "NetworkManager.h" +#include "nm-utils.h" +#include "nm-setting-connection.h" #include "nm-remote-connection.h" #include "nm-remote-connection-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c index 421f70305a..fa2b325f05 100644 --- a/libnm-glib/nm-remote-settings.c +++ b/libnm-glib/nm-remote-settings.c @@ -19,13 +19,12 @@ * Copyright 2009 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <NetworkManager.h> -#include <nm-connection.h> -#include "nm-default.h" +#include "NetworkManager.h" +#include "nm-connection.h" #include "nm-dbus-glib-types.h" #include "nm-remote-settings.h" #include "nm-remote-connection-private.h" diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c index 99871ad2d9..a0966f9f6c 100644 --- a/libnm-glib/nm-secret-agent.c +++ b/libnm-glib/nm-secret-agent.c @@ -18,12 +18,11 @@ * Copyright 2010 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> #include <dbus/dbus-glib-lowlevel.h> -#include "nm-default.h" #include "NetworkManager.h" #include "nm-secret-agent.h" #include "nm-glib-enum-types.h" diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c index 30936f4ee6..19f19e368d 100644 --- a/libnm-glib/nm-types.c +++ b/libnm-glib/nm-types.c @@ -18,11 +18,11 @@ * Copyright 2008 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus-glib.h> #include <string.h> -#include "nm-default.h" + #include "nm-types.h" #include "nm-types-private.h" #include "nm-object-private.h" diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c index 16e8db5e94..7670d2efd0 100644 --- a/libnm-glib/nm-vpn-connection.c +++ b/libnm-glib/nm-vpn-connection.c @@ -19,9 +19,10 @@ * Copyright 2007 - 2012 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> + #include "nm-vpn-connection.h" #include "NetworkManager.h" #include "nm-utils.h" diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c index b94084e2b6..fee6fc9f28 100644 --- a/libnm-glib/nm-vpn-plugin-ui-interface.c +++ b/libnm-glib/nm-vpn-plugin-ui-interface.c @@ -19,7 +19,7 @@ * Copyright 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include "nm-vpn-plugin-ui-interface.h" diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c index 9aafb19f07..d53c98345f 100644 --- a/libnm-glib/nm-vpn-plugin-utils.c +++ b/libnm-glib/nm-vpn-plugin-utils.c @@ -18,7 +18,7 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <errno.h> #include <stdlib.h> diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c index aa4fabf407..67ddd83b32 100644 --- a/libnm-glib/nm-vpn-plugin.c +++ b/libnm-glib/nm-vpn-plugin.c @@ -19,9 +19,8 @@ * Copyright 2007 - 2008 Red Hat, Inc. */ -#include "config.h" - #include "nm-default.h" + #include "nm-vpn-plugin.h" #include <signal.h> diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c index 1c40a2174f..6a3b8effab 100644 --- a/libnm-glib/nm-wimax-nsp.c +++ b/libnm-glib/nm-wimax-nsp.c @@ -18,15 +18,13 @@ * Copyright 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-connection.h> -#include <nm-setting-connection.h> -#include <nm-setting-wimax.h> - -#include "nm-default.h" +#include "nm-connection.h" +#include "nm-setting-connection.h" +#include "nm-setting-wimax.h" #include "nm-wimax-nsp.h" #include "NetworkManager.h" #include "nm-types-private.h" diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c index f528bc26fb..da2e39e04f 100644 --- a/libnm-glib/tests/test-nm-client.c +++ b/libnm-glib/tests/test-nm-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -27,7 +27,6 @@ #include <sys/types.h> #include <signal.h> -#include "nm-default.h" #include "nm-client.h" #include "nm-device-wifi.h" #include "nm-device-ethernet.h" diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c index 83227d4bbc..9213aa720e 100644 --- a/libnm-glib/tests/test-remote-settings-client.c +++ b/libnm-glib/tests/test-remote-settings-client.c @@ -18,7 +18,7 @@ * */ -#include "config.h" +#include "nm-default.h" #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -28,12 +28,10 @@ #include <signal.h> #include "NetworkManager.h" - #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-utils.h" -#include "nm-default.h" #include "nm-remote-settings.h" #include "nm-test-libnm-utils.h" |