all: rename nm-glib-compat.h to nm-glib.h, use everywhere

Rather than randomly including one or more of <glib.h>,
<glib-object.h>, and <gio/gio.h> everywhere (and forgetting to include
"nm-glib-compat.h" most of the time), rename nm-glib-compat.h to
nm-glib.h, include <gio/gio.h> from there, and then change all .c
files in NM to include "nm-glib.h" rather than including the glib
headers directly.

(Public headers files still have to include the real glib headers,
since nm-glib.h isn't installed...)

Also, remove glib includes from header files that are already
including a base object header file (which must itself already include
the glib headers).

diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index 085d43d..b930e26 100644 (file)
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include <glib-object.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
@@ -30,6 +29,7 @@
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 

diff --git a/callouts/nm-dispatcher-utils.h b/callouts/nm-dispatcher-utils.h
index 665a0d4..be67787 100644 (file)
--- a/callouts/nm-dispatcher-utils.h
+++ b/callouts/nm-dispatcher-utils.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
 #define __NETWORKMANAGER_DISPATCHER_UTILS_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 char **
 nm_dispatcher_utils_construct_envp (const char *action,

diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c
index d9fe147..ef6f2a9 100644 (file)
--- a/callouts/nm-dispatcher.c
+++ b/callouts/nm-dispatcher.c
@@ -32,13 +32,11 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib-unix.h>
 
-
+#include "nm-glib.h"
 #include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
-#include "nm-glib-compat.h"
 
 #include "nmdbus-dispatcher.h"
 

diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index 023c77a..c6516b3 100644 (file)
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -23,9 +23,8 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 1695ed5..896e761 100644 (file)
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,6 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include "nm-glib.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-secret-agent-simple.h"

diff --git a/clients/cli/common.c b/clients/cli/common.c
index d92aeaf..db20372 100644 (file)
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,8 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "common.h"
 #include "utils.h"
 

diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index c09eff9..3678057 100644 (file)
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,6 +30,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "utils.h"
 #include "common.h"

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index fd2f7b6..70135e1 100644 (file)
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -25,9 +25,9 @@
 #include <errno.h>
 #include <readline/readline.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"

diff --git a/clients/cli/general.c b/clients/cli/general.c
index fdf22c7..b5fd5e1 100644 (file)
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -22,14 +22,13 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "utils.h"
 #include "general.h"
 
-
 /* Available fields for 'general status' */
 static NmcOutputField nmc_fields_nm_status[] = {
        {"RUNNING",      N_("RUNNING"),      15},  /* 0 */

diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index c27798c..2c19e48 100644 (file)
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -33,12 +33,11 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
-#include "nm-glib-compat.h"
 #include "utils.h"
 #include "common.h"
 #include "connections.h"

diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index a163b82..269fa6d 100644 (file)
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -27,9 +27,9 @@
 #include <unistd.h>
 #include <termios.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
 #include "common.h"
@@ -142,7 +142,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
 #else
 /* polkit agent is not avalable; implement stub functions. */
 
-#include <glib.h>
+#include "nm-glib.h"
 #include "nmcli.h"
 #include "polkit-agent.h"
 

diff --git a/clients/cli/settings.c b/clients/cli/settings.c
index 2f931b7..42d8832 100644 (file)
--- a/clients/cli/settings.c
+++ b/clients/cli/settings.c
@@ -22,13 +22,12 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"
-#include "nm-glib-compat.h"
 #include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 

diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 690ec9b..6552e15 100644 (file)
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -29,9 +29,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "utils.h"
 
 int

diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index 82df1b2..bad5f43 100644 (file)
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -36,10 +36,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-polkit-listener.h"
 
 G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)

diff --git a/clients/common/nm-polkit-listener.h b/clients/common/nm-polkit-listener.h
index 3cd7501..ffdc91a 100644 (file)
--- a/clients/common/nm-polkit-listener.h
+++ b/clients/common/nm-polkit-listener.h
@@ -19,11 +19,11 @@
 #ifndef __NM_POLKIT_LISTENER_H__
 #define __NM_POLKIT_LISTENER_H__
 
-#include <glib.h>
-
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
 #include <polkitagent/polkitagent.h>
 
+#include "nm-glib.h"
+
 G_BEGIN_DECLS
 
 #define NM_TYPE_POLKIT_LISTENER            (nm_polkit_listener_get_type ())

diff --git a/clients/nm-online.c b/clients/nm-online.c
index cd97e6c..fc4e864 100644 (file)
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -41,7 +41,8 @@
 #include <glib/gi18n.h>
 
 #include <NetworkManager.h>
-#include "nm-glib-compat.h"
+
+#include "nm-glib.h"
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"

diff --git a/clients/tui/newt/nmt-newt-types.h b/clients/tui/newt/nmt-newt-types.h
index 608f7ff..775c3bc 100644 (file)
--- a/clients/tui/newt/nmt-newt-types.h
+++ b/clients/tui/newt/nmt-newt-types.h
@@ -19,9 +19,9 @@
 #ifndef NMT_NEWT_TYPES_H
 #define NMT_NEWT_TYPES_H
 
-#include <glib-object.h>
 #include <newt.h>
-#include "nm-glib-compat.h"
+
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index 70a65a8..b405c9d 100644 (file)
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -30,7 +30,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nmt-newt-utils.h"
 
 static void

diff --git a/clients/tui/newt/nmt-newt-utils.h b/clients/tui/newt/nmt-newt-utils.h
index 3b37868..7a3b677 100644 (file)
--- a/clients/tui/newt/nmt-newt-utils.h
+++ b/clients/tui/newt/nmt-newt-utils.h
@@ -20,7 +20,8 @@
 #define NMT_NEWT_UTILS_H
 
 #include <newt.h>
-#include <glib.h>
+
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 9218c31..a21ed66 100644 (file)
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "nm-editor-bindings.h"
-#include "nm-gvaluearray-compat.h"
 
 static void
 value_transform_string_int (const GValue *src_value,

diff --git a/clients/tui/nmt-editor.c b/clients/tui/nmt-editor.c
index abc9286..a0c1534 100644 (file)
--- a/clients/tui/nmt-editor.c
+++ b/clients/tui/nmt-editor.c
@@ -27,10 +27,10 @@
 
 #include "nmt-editor.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"

diff --git a/clients/tui/nmt-mac-entry.h b/clients/tui/nmt-mac-entry.h
index 2e3e6cd..2852de8 100644 (file)
--- a/clients/tui/nmt-mac-entry.h
+++ b/clients/tui/nmt-mac-entry.h
@@ -19,6 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nmt-newt.h"
 

diff --git a/clients/tui/nmt-page-bond.c b/clients/tui/nmt-page-bond.c
index b043b51..89e10cf 100644 (file)
--- a/clients/tui/nmt-page-bond.c
+++ b/clients/tui/nmt-page-bond.c
@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"

diff --git a/clients/tui/nmt-page-bridge-port.c b/clients/tui/nmt-page-bridge-port.c
index c9ef14e..ee18ba5 100644 (file)
--- a/clients/tui/nmt-page-bridge-port.c
+++ b/clients/tui/nmt-page-bridge-port.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bridge-port.h"
 
 G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)

diff --git a/clients/tui/nmt-page-bridge.c b/clients/tui/nmt-page-bridge.c
index ee42d78..84491b6 100644 (file)
--- a/clients/tui/nmt-page-bridge.c
+++ b/clients/tui/nmt-page-bridge.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"

diff --git a/clients/tui/nmt-page-dsl.c b/clients/tui/nmt-page-dsl.c
index 1d476aa..0b0f1b9 100644 (file)
--- a/clients/tui/nmt-page-dsl.c
+++ b/clients/tui/nmt-page-dsl.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"

diff --git a/clients/tui/nmt-page-dsl.h b/clients/tui/nmt-page-dsl.h
index b938ead..8da0e05 100644 (file)
--- a/clients/tui/nmt-page-dsl.h
+++ b/clients/tui/nmt-page-dsl.h
@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_DSL_H
 #define NMT_PAGE_DSL_H
 
+#include "nm-glib.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

diff --git a/clients/tui/nmt-page-ethernet.c b/clients/tui/nmt-page-ethernet.c
index cf4ef2c..cec0491 100644 (file)
--- a/clients/tui/nmt-page-ethernet.c
+++ b/clients/tui/nmt-page-ethernet.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

diff --git a/clients/tui/nmt-page-infiniband.c b/clients/tui/nmt-page-infiniband.c
index f39b0b8..ecc5dc3 100644 (file)
--- a/clients/tui/nmt-page-infiniband.c
+++ b/clients/tui/nmt-page-infiniband.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 

diff --git a/clients/tui/nmt-page-ip4.c b/clients/tui/nmt-page-ip4.c
index df3f0b6..366a391 100644 (file)
--- a/clients/tui/nmt-page-ip4.c
+++ b/clients/tui/nmt-page-ip4.c
@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

diff --git a/clients/tui/nmt-page-ip6.c b/clients/tui/nmt-page-ip6.c
index 1513dbf..ea8314d 100644 (file)
--- a/clients/tui/nmt-page-ip6.c
+++ b/clients/tui/nmt-page-ip6.c
@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

diff --git a/clients/tui/nmt-page-ppp.c b/clients/tui/nmt-page-ppp.c
index cec3654..85690e4 100644 (file)
--- a/clients/tui/nmt-page-ppp.c
+++ b/clients/tui/nmt-page-ppp.c
@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"

diff --git a/clients/tui/nmt-page-team-port.c b/clients/tui/nmt-page-team-port.c
index 645dc9d..a571924 100644 (file)
--- a/clients/tui/nmt-page-team-port.c
+++ b/clients/tui/nmt-page-team-port.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-team-port.h"
 
 G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)

diff --git a/clients/tui/nmt-page-team.c b/clients/tui/nmt-page-team.c
index e520b02..b766494 100644 (file)
--- a/clients/tui/nmt-page-team.c
+++ b/clients/tui/nmt-page-team.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"

diff --git a/clients/tui/nmt-page-team.h b/clients/tui/nmt-page-team.h
index 2d8bf07..95a0e45 100644 (file)
--- a/clients/tui/nmt-page-team.h
+++ b/clients/tui/nmt-page-team.h
@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_TEAM_H
 #define NMT_PAGE_TEAM_H
 
+#include "nm-glib.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

diff --git a/clients/tui/nmt-page-vlan.c b/clients/tui/nmt-page-vlan.c
index 9b9c8f5..fefb244 100644 (file)
--- a/clients/tui/nmt-page-vlan.c
+++ b/clients/tui/nmt-page-vlan.c
@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"

diff --git a/clients/tui/nmt-page-wifi.c b/clients/tui/nmt-page-wifi.c
index 9cd20ab..cf593f0 100644 (file)
--- a/clients/tui/nmt-page-wifi.c
+++ b/clients/tui/nmt-page-wifi.c
@@ -29,9 +29,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

diff --git a/clients/tui/nmt-route-editor.c b/clients/tui/nmt-route-editor.c
index 77bbec7..156f7ad 100644 (file)
--- a/clients/tui/nmt-route-editor.c
+++ b/clients/tui/nmt-route-editor.c
@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 

diff --git a/clients/tui/nmt-utils.h b/clients/tui/nmt-utils.h
index 7e24fca..cb7e632 100644 (file)
--- a/clients/tui/nmt-utils.h
+++ b/clients/tui/nmt-utils.h
@@ -19,7 +19,7 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
-#include <glib-object.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 0fac98e..3519d5b 100644 (file)
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -30,11 +30,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 
+#include "nm-glib.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 

diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index ab64691..be8f538 100644 (file)
--- a/clients/tui/vpn-helpers.c
+++ b/clients/tui/vpn-helpers.c
@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 #include <gmodule.h>
 #include <glib/gi18n.h>
 
@@ -39,6 +38,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>
 
+#include "nm-glib.h"
 #include "vpn-helpers.h"
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE

diff --git a/clients/tui/vpn-helpers.h b/clients/tui/vpn-helpers.h
index 28019ca..3bb26c6 100644 (file)
--- a/clients/tui/vpn-helpers.h
+++ b/clients/tui/vpn-helpers.h
@@ -19,12 +19,13 @@
 #ifndef _VPN_HELPERS_H_
 #define _VPN_HELPERS_H_
 
-#include <glib.h>
 #include <nm-connection.h>
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE
 #include <nm-vpn-plugin-ui-interface.h>
 
+#include "nm-glib.h"
+
 GHashTable *vpn_get_plugins (GError **error);
 
 NMVpnPluginUiInterface *vpn_get_plugin_by_service (const char *service);

diff --git a/configure.ac b/configure.ac
index b0c2277..c0df38e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -297,7 +297,7 @@ PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
 
 dnl GLIB_VERSION_MIN_REQUIRED should match the version above.
 dnl GLIB_VERSION_MAX_ALLOWED should be set to the same version;
-dnl nm-glib-compat.h will cause it to be overridden for the functions
+dnl nm-glib.h will cause it to be overridden for the functions
 dnl we have compat versions of.
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
 

diff --git a/include/Makefile.am b/include/Makefile.am
index 2cd66c9..66b0bec 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \
      nm-dbus-glib-types.h \
-     nm-glib-compat.h \
+     nm-glib.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
      nm-macros-internal.h

diff --git a/include/nm-glib-compat.h b/include/nm-glib.h
similarity index 98%
rename from include/nm-glib-compat.h
rename to include/nm-glib.h
index 5e36516..b46feb7 100644 (file)
--- a/include/nm-glib-compat.h
+++ b/include/nm-glib.h
@@ -17,15 +17,13 @@
  * Copyright 2008 - 2011 Red Hat, Inc.
  */
 
-#ifndef __NM_GLIB_COMPAT_H__
-#define __NM_GLIB_COMPAT_H__
+#ifndef __NM_GLIB_H__
+#define __NM_GLIB_H__
 
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gio/gio.h>
 #include <string.h>
 
-
 #ifdef __clang__
 
 #undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -43,7 +41,6 @@
 
 #include "nm-gvaluearray-compat.h"
 
-
 static inline void
 __g_type_ensure (GType type)
 {
@@ -261,4 +258,4 @@ _g_key_file_save_to_file (GKeyFile     *key_file,
 #endif
 
 
-#endif  /* __NM_GLIB_COMPAT_H__ */
+#endif  /* __NM_GLIB_H__ */

diff --git a/include/nm-gvaluearray-compat.h b/include/nm-gvaluearray-compat.h
index f0b4a6c..424e6be 100644 (file)
--- a/include/nm-gvaluearray-compat.h
+++ b/include/nm-gvaluearray-compat.h
@@ -20,10 +20,6 @@
 #ifndef __NM_GVALUEARRAY_COMPAT_H__
 #define __NM_GVALUEARRAY_COMPAT_H__
 
-#include <glib.h>
-
-#include "nm-glib-compat.h"
-
 #define g_value_array_get_type() \
   G_GNUC_EXTENSION ({ \
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS \

diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h
index da6eaca..9d1beab 100644 (file)
--- a/include/nm-macros-internal.h
+++ b/include/nm-macros-internal.h
@@ -22,8 +22,7 @@
 #ifndef __NM_MACROS_INTERNAL_H__
 #define __NM_MACROS_INTERNAL_H__
 
-
-#include <glib.h>
+#include "nm-glib.h"
 
 /********************************************************/
 

diff --git a/include/nm-test-utils.h b/include/nm-test-utils.h
index 3007674..2c60e98 100644 (file)
--- a/include/nm-test-utils.h
+++ b/include/nm-test-utils.h
@@ -86,14 +86,12 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
 #include <string.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-macros-internal.h"
-#include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
 #ifdef __NETWORKMANAGER_LOGGING_H__

diff --git a/libnm-core/crypto.c b/libnm-core/crypto.c
index 205d22c..c6b6653 100644 (file)
--- a/libnm-core/crypto.c
+++ b/libnm-core/crypto.c
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

diff --git a/libnm-core/crypto.h b/libnm-core/crypto.h
index 434f108..d478410 100644 (file)
--- a/libnm-core/crypto.h
+++ b/libnm-core/crypto.h
@@ -24,7 +24,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"

diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
index 01291f0..32692fd 100644 (file)
--- a/libnm-core/crypto_gnutls.c
+++ b/libnm-core/crypto_gnutls.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <gnutls/gnutls.h>
@@ -31,6 +30,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

diff --git a/libnm-core/crypto_nss.c b/libnm-core/crypto_nss.c
index d0c3506..0c5905c 100644 (file)
--- a/libnm-core/crypto_nss.c
+++ b/libnm-core/crypto_nss.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <prinit.h>
@@ -36,6 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 8f22658..353421a 100644 (file)
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -22,9 +22,9 @@
 
 #include "config.h"
 
-#include <glib-object.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"

diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h
index f05528b..2ff9e53 100644 (file)
--- a/libnm-core/nm-core-internal.h
+++ b/libnm-core/nm-core-internal.h
@@ -33,8 +33,8 @@
  * and some test programs.
  **/
 
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-dbus-interface.h"

diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index 4bdbdd0..e2e3265 100644 (file)
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -21,10 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 
 typedef struct {

diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 3b1b1bc..b2e9506 100644 (file)
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -21,10 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-errors.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-interface.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"

diff --git a/libnm-core/nm-keyfile-internal.h b/libnm-core/nm-keyfile-internal.h
index f4bb079..5f4c927 100644 (file)
--- a/libnm-core/nm-keyfile-internal.h
+++ b/libnm-core/nm-keyfile-internal.h
@@ -22,13 +22,12 @@
 #ifndef __NM_KEYFILE_INTERNAL_H__
 #define __NM_KEYFILE_INTERNAL_H__
 
-#include <glib.h>
 #include <sys/types.h>
 
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 
-
 /*********************************************************/
 
 #define NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB "data:;base64,"

diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile-reader.c
index 9f2dbc1..dfc3944 100644 (file)
--- a/libnm-core/nm-keyfile-reader.c
+++ b/libnm-core/nm-keyfile-reader.c
@@ -30,14 +30,13 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 
-
 typedef struct {
        NMConnection *connection;
        GKeyFile *keyfile;

diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index d04a3d1..2540afe 100644 (file)
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
@@ -31,7 +31,6 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 
-
 typedef struct {
        const char *setting;
        const char *alias;

diff --git a/libnm-core/nm-keyfile-writer.c b/libnm-core/nm-keyfile-writer.c
index ff433b2..9dc9b38 100644 (file)
--- a/libnm-core/nm-keyfile-writer.c
+++ b/libnm-core/nm-keyfile-writer.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
@@ -43,7 +44,6 @@
 #include "nm-utils.h"
 
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index 5d27070..a52c3cc 100644 (file)
--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-#include "nm-property-compare.h"
-#include "nm-glib-compat.h"
-
 #include <string.h>
 #include <math.h>
 #include <netinet/in.h>
-#include <gio/gio.h>
+
+#include "nm-property-compare.h"
+#include "nm-glib.h"
 
 static gint
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)

diff --git a/libnm-core/nm-property-compare.h b/libnm-core/nm-property-compare.h
index 3301678..c03d147 100644 (file)
--- a/libnm-core/nm-property-compare.h
+++ b/libnm-core/nm-property-compare.h
@@ -23,7 +23,7 @@
 #ifndef __NM_PROPERTY_COMPARE_H__
 #define __NM_PROPERTY_COMPARE_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 int nm_property_compare (GVariant *value1, GVariant *value2);
 

diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index e2e3450..b4cd213 100644 (file)
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -26,11 +26,11 @@
 #include <arpa/inet.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-utils.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 

diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index dc8d7fa..ea81948 100644 (file)
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -21,10 +21,10 @@
 #ifndef __NM_SETTING_PRIVATE_H__
 #define __NM_SETTING_PRIVATE_H__
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
-#include "nm-glib-compat.h"
 
 #include "nm-core-internal.h"
 

diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c
index 3fd780c..668565f 100644 (file)
--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-setting-serial.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 
 /**

diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index b6af31a..07daeac 100644 (file)
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"

diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 2519d32..f6a9e5a 100644 (file)
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -31,9 +31,9 @@
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
 #include "gsystem-local-alloc.h"

diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c
index 12db9c2..6e861ff 100644 (file)
--- a/libnm-core/tests/test-compare.c
+++ b/libnm-core/tests/test-compare.c
@@ -24,8 +24,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "nm-property-compare.h"
 
 #include "nm-test-utils.h"

diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index e4ca808..282939f 100644 (file)
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-utils.h"
 #include "nm-errors.h"

diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index dd897dd..e8e96bb 100644 (file)
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -23,10 +23,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 
 #include "nm-setting-private.h"
@@ -62,7 +62,6 @@
 #include "nm-setting-wireless-security.h"
 #include "nm-simple-connection.h"
 #include "nm-keyfile-internal.h"
-#include "nm-glib-compat.h"
 
 #include "nm-test-utils.h"
 #include "test-general-enums.h"

diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index 178fddd..6995522 100644 (file)
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c
index 16f6016..255448b 100644 (file)
--- a/libnm-core/tests/test-setting-8021x.c
+++ b/libnm-core/tests/test-setting-8021x.c
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-8021x.h"
 

diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c
index 0369ca5..2e9fa1a 100644 (file)
--- a/libnm-core/tests/test-setting-dcb.c
+++ b/libnm-core/tests/test-setting-dcb.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "nm-setting-dcb.h"
 #include "nm-connection.h"
 #include "nm-errors.h"

diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index 7d7715c..81d7542 100644 (file)
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index da3bc5f..c8ea986 100644 (file)
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -30,6 +30,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+
+#include "nm-glib.h"
 #include "nm-client.h"
 #include "nm-device.h"
 #include "nm-device-ethernet.h"
@@ -38,7 +40,6 @@
 #include "nm-active-connection.h"
 #include "nm-vpn-connection.h"
 #include "nm-setting-ip4-config.h"
-#include "nm-glib-compat.h"
 
 static gboolean
 test_wireless_enabled (NMClient *client)

diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index 7acfcc9..7e99db1 100644 (file)
--- a/libnm-glib/libnm_glib.c
+++ b/libnm-glib/libnm_glib.c
@@ -26,14 +26,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "libnm_glib.h"
 
-#include "nm-glib-compat.h"
-
 #define        DBUS_NO_SERVICE_ERROR                   "org.freedesktop.DBus.Error.ServiceDoesNotExist"
 
 

diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index c6b7c9c..5c6ba00 100644 (file)
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -24,14 +24,13 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 e5f474f..613c357 100644 (file)
--- a/libnm-glib/nm-active-connection.c
+++ b/libnm-glib/nm-active-connection.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"
@@ -31,7 +32,6 @@
 #include "nm-device-private.h"
 #include "nm-connection.h"
 #include "nm-vpn-connection.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers-private.h"
 
 static GType _nm_active_connection_type_for_path (DBusGConnection *connection,

diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 40add09..0322449 100644 (file)
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-client.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
@@ -35,7 +36,6 @@
 #include "nm-vpn-connection.h"
 #include "nm-object-cache.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 

diff --git a/libnm-glib/nm-dbus-helpers-private.h b/libnm-glib/nm-dbus-helpers-private.h
index 8a350e7..417faf3 100644 (file)
--- a/libnm-glib/nm-dbus-helpers-private.h
+++ b/libnm-glib/nm-dbus-helpers-private.h
@@ -21,10 +21,11 @@
 #ifndef NM_DBUS_HELPERS_PRIVATE_H
 #define NM_DBUS_HELPERS_PRIVATE_H
 
-#include <gio/gio.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib.h"
+
 DBusGConnection *_nm_dbus_new_connection (GError **error);
 
 gboolean         _nm_dbus_is_connection_private (DBusGConnection *connection);

diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c
index 00e04ab..076f198 100644 (file)
--- a/libnm-glib/nm-dbus-helpers.c
+++ b/libnm-glib/nm-dbus-helpers.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#include "nm-glib.h"
 #include "nm-dbus-helpers-private.h"
 #include "NetworkManager.h"
 

diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index 786d4f1..b8a253c 100644 (file)
--- a/libnm-glib/nm-device-bond.c
+++ b/libnm-glib/nm-device-bond.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bond.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 ef69fb2..f80835a 100644 (file)
--- a/libnm-glib/nm-device-bridge.c
+++ b/libnm-glib/nm-device-bridge.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bridge.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 58d4834..5b09399 100644 (file)
--- a/libnm-glib/nm-device-bt.c
+++ b/libnm-glib/nm-device-bt.c
@@ -24,11 +24,10 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
 
+#include "nm-glib.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 d27a980..24e3f36 100644 (file)
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-pppoe.h>
 
+#include "nm-glib.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
index 663b365..10b65aa 100644 (file)
--- a/libnm-glib/nm-device-infiniband.c
+++ b/libnm-glib/nm-device-infiniband.c
@@ -24,12 +24,11 @@
 #include <linux/if_infiniband.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-infiniband.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 524d86c..7ef2926 100644 (file)
--- a/libnm-glib/nm-device-modem.c
+++ b/libnm-glib/nm-device-modem.c
@@ -23,12 +23,11 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
 
+#include "nm-glib.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 e68fda6..f33c68e 100644 (file)
--- a/libnm-glib/nm-device-olpc-mesh.c
+++ b/libnm-glib/nm-device-olpc-mesh.c
@@ -22,11 +22,10 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
 
+#include "nm-glib.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 d9a5fce..6a16846 100644 (file)
--- a/libnm-glib/nm-device-team.c
+++ b/libnm-glib/nm-device-team.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-team.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 26c234b..475be6b 100644 (file)
--- a/libnm-glib/nm-device-vlan.c
+++ b/libnm-glib/nm-device-vlan.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-vlan.h>
 #include <nm-utils.h>
 
+#include "nm-glib.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 28609c7..788e669 100644 (file)
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 
+#include "nm-glib.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 5211e04..e941420 100644 (file)
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -24,11 +24,10 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
+#include "nm-glib.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 731edb6..b511254 100644 (file)
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -26,6 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
@@ -47,7 +48,6 @@
 #include "nm-remote-connection.h"
 #include "nm-types.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-utils.h"
 #include "nm-dbus-helpers-private.h"
 

diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c
index 752c606..09bf720 100644 (file)
--- a/libnm-glib/nm-object-cache.c
+++ b/libnm-glib/nm-object-cache.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
+#include "nm-glib.h"
 #include "nm-object-cache.h"
 #include "nm-object.h"
 

diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h
index 7aca3b4..5fcd2ef 100644 (file)
--- a/libnm-glib/nm-object-cache.h
+++ b/libnm-glib/nm-object-cache.h
@@ -21,8 +21,7 @@
 #ifndef NM_OBJECT_CACHE_H
 #define NM_OBJECT_CACHE_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h
index 75e63b2..1b18918 100644 (file)
--- a/libnm-glib/nm-object-private.h
+++ b/libnm-glib/nm-object-private.h
@@ -21,7 +21,7 @@
 #ifndef NM_OBJECT_PRIVATE_H
 #define NM_OBJECT_PRIVATE_H
 
-#include <gio/gio.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 void _nm_object_ensure_inited (NMObject *object);

diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 2cf7119..206b3f5 100644 (file)
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -22,16 +22,15 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-types.h"
 #include "nm-dbus-helpers-private.h"
 

diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index 3a70e81..1dce200 100644 (file)
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -22,17 +22,16 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
+#include "nm-glib.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers-private.h"
 
 #define NM_REMOTE_CONNECTION_BUS "bus"

diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index 20b4638..37a4622 100644 (file)
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -25,12 +25,12 @@
 #include <NetworkManager.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-remote-settings.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers-private.h"
-#include "nm-glib-compat.h"
 #include "nm-object-private.h"
 
 /**

diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 04f8dd8..3da7658 100644 (file)
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.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 5b434aa..daafc2b 100644 (file)
--- a/libnm-glib/nm-types.c
+++ b/libnm-glib/nm-types.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-types-private.h"
 #include "nm-object-private.h"

diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index 3acf26e..290ecb4 100644 (file)
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <signal.h>
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-vpn-plugin.h"
 #include "nm-vpn-enum-types.h"
 #include "nm-utils.h"

diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
index 1735ab3..e85fb4e 100644 (file)
--- a/libnm-glib/nm-wimax-nsp.c
+++ b/libnm-glib/nm-wimax-nsp.c
@@ -22,12 +22,11 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
+#include "nm-glib.h"
 #include "nm-wimax-nsp.h"
 #include "NetworkManager.h"
 #include "nm-types-private.h"

diff --git a/libnm-glib/tests/common.c b/libnm-glib/tests/common.c
index 540d43a..3989f75 100644 (file)
--- a/libnm-glib/tests/common.c
+++ b/libnm-glib/tests/common.c
@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <dbus/dbus.h>
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 
 #include "common.h"

diff --git a/libnm-glib/tests/common.h b/libnm-glib/tests/common.h
index 7c49d25..63dbe4d 100644 (file)
--- a/libnm-glib/tests/common.h
+++ b/libnm-glib/tests/common.h
@@ -18,7 +18,7 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include <gio/gio.h>
+#include "nm-glib.h"
 
 typedef struct {
        GDBusConnection *bus;

diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
index 0ec3924..067d460 100644 (file)
--- a/libnm-glib/tests/test-nm-client.c
+++ b/libnm-glib/tests/test-nm-client.c
@@ -23,12 +23,12 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 
 #include <NetworkManager.h>
+#include "nm-glib.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 afaa6fe..b40a0fa 100644 (file)
--- a/libnm-glib/tests/test-remote-settings-client.c
+++ b/libnm-glib/tests/test-remote-settings-client.c
@@ -23,7 +23,6 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -34,6 +33,7 @@
 #include <nm-setting-wired.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-remote-settings.h"
 #include "common.h"
 

diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 8a10af9..8b6198c 100644 (file)
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 
 GQuark

diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h
index 315d8fe..3604158 100644 (file)
--- a/libnm-util/crypto.h
+++ b/libnm-util/crypto.h
@@ -24,7 +24,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"

diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index f61ad86..8b0c9f7 100644 (file)
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <gnutls/gnutls.h>
@@ -31,6 +30,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 
 #define SALT_LEN 8

diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c
index edd19b5..9f60f5c 100644 (file)
--- a/libnm-util/crypto_nss.c
+++ b/libnm-util/crypto_nss.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <prinit.h>
@@ -36,6 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 
 static gboolean initialized = FALSE;

diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 3a929b0..2671ce3 100644 (file)
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -22,10 +22,10 @@
 
 #include "config.h"
 
-#include <glib-object.h>
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"

diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index 11f9574..456c341 100644 (file)
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -22,8 +22,8 @@
 
 #include "config.h"
 
+#include "nm-glib.h"
 #include "nm-param-spec-specialized.h"
-#include "nm-glib-compat.h"
 
 struct _NMParamSpecSpecialized {
        GParamSpec parent;

diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h
index 7803e91..226c301 100644 (file)
--- a/libnm-util/nm-param-spec-specialized.h
+++ b/libnm-util/nm-param-spec-specialized.h
@@ -23,7 +23,7 @@
 #ifndef NM_PARAM_SPEC_SPECIALIZED_H
 #define NM_PARAM_SPEC_SPECIALIZED_H
 
-#include <glib-object.h>
+#include "nm-glib.h"
 
 typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized;
 

diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 4db43cb..838a88e 100644 (file)
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -26,14 +26,13 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 
-
 /**
  * SECTION:nm-setting-ip4-config
  * @short_description: Describes IPv4 addressing, routing, and name service properties

diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 4e69a07..8c8055c 100644 (file)
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -25,11 +25,11 @@
 #include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 
 /**

diff --git a/libnm-util/nm-setting-private.h b/libnm-util/nm-setting-private.h
index 5e1122e..1b6c037 100644 (file)
--- a/libnm-util/nm-setting-private.h
+++ b/libnm-util/nm-setting-private.h
@@ -21,7 +21,7 @@
 #ifndef NM_SETTING_PRIVATE_H
 #define NM_SETTING_PRIVATE_H
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 
 #define NM_SETTING_SECRET_FLAGS_ALL \
        (NM_SETTING_SECRET_FLAG_NONE | \

diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 24f2c89..9524881 100644 (file)
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/nm-setting-serial.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-setting-serial.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 
 /**

diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 143063e..23c2cbf 100644 (file)
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -28,12 +28,11 @@
 #include <uuid/uuid.h>
 #include <libintl.h>
 #include <gmodule.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-private.h"
 #include "crypto.h"

diff --git a/libnm-util/nm-value-transforms.c b/libnm-util/nm-value-transforms.c
index 00e7e77..6a6f5bf 100644 (file)
--- a/libnm-util/nm-value-transforms.c
+++ b/libnm-util/nm-value-transforms.c
@@ -23,10 +23,10 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 
 static void
 _nm_utils_convert_op_to_string (const GValue *src_value, GValue *dest_value)

diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index 8055fac..290a722 100644 (file)
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/tests/test-crypto.c
@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-utils.h"
 

diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index f365dc0..598914d 100644 (file)
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <string.h>
 #include <netinet/ether.h>
@@ -30,6 +29,7 @@
 #include <sys/resource.h>
 
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 
 #include "nm-setting-private.h"

diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c
index 9738d44..66a4831 100644 (file)
--- a/libnm-util/tests/test-libnm-linking.c
+++ b/libnm-util/tests/test-libnm-linking.c
@@ -21,10 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <nm-utils.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 
 extern GType nm_state_get_type (void);
 

diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c
index adf3a94..cc23813 100644 (file)
--- a/libnm-util/tests/test-secrets.c
+++ b/libnm-util/tests/test-secrets.c
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-8021x.h"

diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c
index dfc07a8..9790669 100644 (file)
--- a/libnm-util/tests/test-setting-8021x.c
+++ b/libnm-util/tests/test-setting-8021x.c
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-8021x.h"
 

diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c
index 8f0af2e..20a0225 100644 (file)
--- a/libnm-util/tests/test-setting-dcb.c
+++ b/libnm-util/tests/test-setting-dcb.c
@@ -21,10 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <nm-utils.h>
-#include <nm-glib-compat.h>
+#include "nm-glib.h"
 #include "nm-setting-dcb.h"
 #include "gsystem-local-alloc.h"
 

diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c
index 70a743c..1f0ba1c 100644 (file)
--- a/libnm-util/tests/test-settings-defaults.c
+++ b/libnm-util/tests/test-settings-defaults.c
@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index e8ab6ef..95c2cf5 100644 (file)
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -23,14 +23,13 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-access-point.h"
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 31f5132..f2951fb 100644 (file)
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"
@@ -31,7 +32,6 @@
 #include "nm-device-private.h"
 #include "nm-connection.h"
 #include "nm-vpn-connection.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"

diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 3d683a1..5ddb70b 100644 (file)
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-client.h"
 #include "nm-manager.h"
 #include "nm-remote-settings.h"
@@ -35,7 +36,6 @@
 #include "nm-vpn-connection.h"
 #include "nm-remote-connection.h"
 #include "nm-object-cache.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);

diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 45e0944..717f7f4 100644 (file)
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -21,9 +21,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-dbus-helpers.h"
 #include "nm-dbus-interface.h"
 

diff --git a/libnm/nm-dbus-helpers.h b/libnm/nm-dbus-helpers.h
index 1b2f28e..2b0809f 100644 (file)
--- a/libnm/nm-dbus-helpers.h
+++ b/libnm/nm-dbus-helpers.h
@@ -21,8 +21,8 @@
 #ifndef __NM_DBUS_HELPERS_PRIVATE_H__
 #define __NM_DBUS_HELPERS_PRIVATE_H__
 
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-compat.h"
 
 GBusType _nm_dbus_bus_type (void);

diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 6bb6732..8959f1e 100644 (file)
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bond.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-bond.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index ce28f2c..2b9efbd 100644 (file)
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bridge.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-bridge.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 7752646..0156631 100644 (file)
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-bt.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index be2cb4d..21bb52b 100644 (file)
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -24,13 +24,12 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-pppoe.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index bce8a87..e8436a9 100644 (file)
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-infiniband.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-infiniband.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index dcbb447..81d7570 100644 (file)
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
 
+#include "nm-glib.h"
 #include "nm-device-modem.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 108e533..32b40eb 100644 (file)
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -23,11 +23,10 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
 
+#include "nm-glib.h"
 #include "nm-device-olpc-mesh.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index cff1d71..5fc09cd 100644 (file)
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -23,12 +23,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-team.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-team.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index fb6e3bd..d499242 100644 (file)
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -23,13 +23,12 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-vlan.h>
 #include <nm-setting-wired.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-vlan.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 4a19f2e..94bb5d3 100644 (file)
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -24,13 +24,12 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-wifi.h"
 #include "nm-access-point.h"
 #include "nm-device-private.h"

diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 67c6682..61406ff 100644 (file)
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -24,12 +24,11 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-wimax.h"
 #include "nm-wimax-nsp.h"
 #include "nm-object-private.h"

diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 19268a4..ba9234d 100644 (file)
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -26,6 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-device-ethernet.h"
@@ -51,7 +52,6 @@
 #include "nm-object-cache.h"
 #include "nm-remote-connection.h"
 #include "nm-core-internal.h"
-#include "nm-glib-compat.h"
 #include "nm-utils.h"
 #include "nm-dbus-helpers.h"
 #include "nm-setting-connection.h"

diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 2fd4027..48e1d83 100644 (file)
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -25,6 +25,7 @@
 #include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-manager.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
@@ -34,7 +35,6 @@
 #include "nm-active-connection.h"
 #include "nm-vpn-connection.h"
 #include "nm-object-cache.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 
 #include "nmdbus-manager.h"

diff --git a/libnm/nm-object-cache.c b/libnm/nm-object-cache.c
index 752c606..09bf720 100644 (file)
--- a/libnm/nm-object-cache.c
+++ b/libnm/nm-object-cache.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
+#include "nm-glib.h"
 #include "nm-object-cache.h"
 #include "nm-object.h"
 

diff --git a/libnm/nm-object-cache.h b/libnm/nm-object-cache.h
index ebadbaa..5e5eead 100644 (file)
--- a/libnm/nm-object-cache.h
+++ b/libnm/nm-object-cache.h
@@ -21,8 +21,7 @@
 #ifndef __NM_OBJECT_CACHE_H__
 #define __NM_OBJECT_CACHE_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h
index 0b13cbb..f8fcee9 100644 (file)
--- a/libnm/nm-object-private.h
+++ b/libnm/nm-object-private.h
@@ -21,7 +21,7 @@
 #ifndef __NM_OBJECT_PRIVATE_H__
 #define __NM_OBJECT_PRIVATE_H__
 
-#include <gio/gio.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer);

diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index bf25000..b86dc7d 100644 (file)
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -22,16 +22,15 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 #include "nm-client.h"
 #include "nm-core-internal.h"

diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 9892497..a27c040 100644 (file)
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -22,16 +22,15 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
+#include "nm-glib.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers.h"
 
 #include "nmdbus-settings-connection.h"

diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index d37e366..d6a786a 100644 (file)
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -26,13 +26,13 @@
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "nm-remote-settings.h"
 #include "nm-client.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
-#include "nm-glib-compat.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
 

diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 6df54d4..97f3bc8 100644 (file)
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-secret-agent-old.h"
 #include "nm-enum-types.h"

diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index 3f3c7c7..5748060 100644 (file)
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -30,9 +30,8 @@
 #include <stdlib.h>
 
 #include <glib/gi18n-lib.h>
-#include <gio/gio.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-vpn-plugin-old.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"

diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 0fed1c6..3fa4ddf 100644 (file)
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -22,12 +22,11 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
+#include "nm-glib.h"
 #include "nm-wimax-nsp.h"
 #include "nm-dbus-interface.h"
 #include "nm-object-private.h"

diff --git a/libnm/tests/common.c b/libnm/tests/common.c
index a90266c..833d7fd 100644 (file)
--- a/libnm/tests/common.c
+++ b/libnm/tests/common.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-dbus-compat.h"
 

diff --git a/libnm/tests/common.h b/libnm/tests/common.h
index aa15167..1fd3f46 100644 (file)
--- a/libnm/tests/common.h
+++ b/libnm/tests/common.h
@@ -18,9 +18,10 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include <gio/gio.h>
 #include <NetworkManager.h>
 
+#include "nm-glib.h"
+
 typedef struct {
        GDBusConnection *bus;
        GDBusProxy *proxy;

diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 1c9bc85..55b0050 100644 (file)
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -20,14 +20,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 
 #include <NetworkManager.h>
-#include "nm-glib-compat.h"
 
+#include "nm-glib.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index d723f6c..2f47b53 100644 (file)
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -20,13 +20,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
 
 #include <NetworkManager.h>
 
+#include "nm-glib.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 3f0095a..28a6c99 100644 (file)
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -28,6 +27,7 @@
 #include <NetworkManager.h>
 #include <nm-secret-agent-old.h>
 
+#include "nm-glib.h"
 #include "common.h"
 
 #include "nm-test-utils.h"

diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index 6292e80..d91a4e6 100644 (file)
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -21,8 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <gio/gio.h>
 #include <glib/gi18n.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -35,6 +33,7 @@
 #include <linux/if.h>
 #include <linux/if_infiniband.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-platform.h"
 #include "nm-utils.h"

diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h
index 2ad132b..47593fb 100644 (file)
--- a/src/NetworkManagerUtils.h
+++ b/src/NetworkManagerUtils.h
@@ -22,10 +22,10 @@
 #ifndef __NETWORKMANAGER_UTILS_H__
 #define __NETWORKMANAGER_UTILS_H__
 
-#include <glib.h>
 #include <stdio.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.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 0830f85..1718cdd 100644 (file)
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -24,12 +24,12 @@
 #include <gudev/gudev.h>
 #include <gmodule.h>
 
+#include "nm-glib.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"
-#include "nm-glib-compat.h"
 
 typedef struct {
        GUdevClient *client;

diff --git a/src/devices/adsl/nm-atm-manager.h b/src/devices/adsl/nm-atm-manager.h
index e4ec3e6..16dc332 100644 (file)
--- a/src/devices/adsl/nm-atm-manager.h
+++ b/src/devices/adsl/nm-atm-manager.h
@@ -22,8 +22,7 @@
 #ifndef __NETWORKMANAGER_ATM_MANAGER_H__
 #define __NETWORKMANAGER_ATM_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index 4d2cac5..f5ed9d7 100644 (file)
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -29,11 +29,11 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-device-adsl.h"
 #include "nm-device-private.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h
index f21381c..74e29d5 100644 (file)
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/devices/adsl/nm-device-adsl.h
@@ -22,9 +22,8 @@
 #ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
 #define __NETWORKMANAGER_DEVICE_ADSL_H__
 
-#include <glib-object.h>
-
 // Parent class
+#include "nm-glib.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 419339a..2cebefa 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -21,11 +21,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 
 #include "nm-bt-error.h"

diff --git a/src/devices/bluetooth/nm-bluez-device.h b/src/devices/bluetooth/nm-bluez-device.h
index 92d99fa..5d89556 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-device.h
+++ b/src/devices/bluetooth/nm-bluez-device.h
@@ -21,11 +21,9 @@
 #ifndef __NETWORKMANAGER_BLUEZ_DEVICE_H__
 #define __NETWORKMANAGER_BLUEZ_DEVICE_H__
 
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gio.h>
 
 #include <config.h>
+#include "nm-glib.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 2e1c46b..193d9f7 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include <gmodule.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-bluez-manager.h"
 #include "nm-device-factory.h"

diff --git a/src/devices/bluetooth/nm-bluez-manager.h b/src/devices/bluetooth/nm-bluez-manager.h
index 8320b29..97b9ac6 100644 (file)
--- a/src/devices/bluetooth/nm-bluez-manager.h
+++ b/src/devices/bluetooth/nm-bluez-manager.h
@@ -22,8 +22,7 @@
 #ifndef __NETWORKMANAGER_BLUEZ_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index f0aa42a..f31c600 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-bluez4-adapter.h"
 #include "nm-bluez-device.h"

diff --git a/src/devices/bluetooth/nm-bluez4-adapter.h b/src/devices/bluetooth/nm-bluez4-adapter.h
index a625641..98d19b2 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-adapter.h
+++ b/src/devices/bluetooth/nm-bluez4-adapter.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
 #define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-bluez-device.h"
 #include "nm-connection-provider.h"
 

diff --git a/src/devices/bluetooth/nm-bluez4-manager.h b/src/devices/bluetooth/nm-bluez4-manager.h
index 13cfef9..e5f5264 100644 (file)
--- a/src/devices/bluetooth/nm-bluez4-manager.h
+++ b/src/devices/bluetooth/nm-bluez4-manager.h
@@ -22,11 +22,8 @@
 #ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ4_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include  <config.h>
-#include  "nm-connection-provider.h"
+#include "nm-glib.h"
+#include "nm-connection-provider.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/devices/bluetooth/nm-bluez5-dun.h b/src/devices/bluetooth/nm-bluez5-dun.h
index 7e25972..bc2f6c7 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-dun.h
+++ b/src/devices/bluetooth/nm-bluez5-dun.h
@@ -21,8 +21,7 @@
 #ifndef _NM_BLUEZ5_UTILS_H_
 #define _NM_BLUEZ5_UTILS_H_
 
-#include <glib.h>
-#include <gio/gio.h>
+#include "nm-glib.h"
 
 typedef struct _NMBluez5DunContext NMBluez5DunContext;
 

diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index 148fe3c..cbbe111 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -25,8 +25,8 @@
 #include <signal.h>
 #include <string.h>
 #include <stdlib.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-bluez-manager.h"
 #include "nm-bluez5-manager.h"

diff --git a/src/devices/bluetooth/nm-bluez5-manager.h b/src/devices/bluetooth/nm-bluez5-manager.h
index 8152976..faf6ce6 100644 (file)
--- a/src/devices/bluetooth/nm-bluez5-manager.h
+++ b/src/devices/bluetooth/nm-bluez5-manager.h
@@ -22,11 +22,8 @@
 #ifndef __NETWORKMANAGER_BLUEZ5_MANAGER_H__
 #define __NETWORKMANAGER_BLUEZ5_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
-#include  <config.h>
-#include  "nm-connection-provider.h"
+#include "nm-glib.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 e3b8e7f..11aabbd 100644 (file)
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/devices/bluetooth/nm-bt-error.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include <glib.h>
+#include "nm-glib.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 88033e2..1de5bed 100644 (file)
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -24,9 +24,8 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-bluez-common.h"
 #include "nm-bluez-device.h"
 #include "nm-dbus-manager.h"

diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index 7f13942..a78761c 100644 (file)
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -20,12 +20,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <errno.h>
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-device-bond.h"
 #include "nm-logging.h"

diff --git a/src/devices/nm-device-bond.h b/src/devices/nm-device-bond.h
index 17217a5..8165bb8 100644 (file)
--- a/src/devices/nm-device-bond.h
+++ b/src/devices/nm-device-bond.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_BOND_H__
 #define __NETWORKMANAGER_DEVICE_BOND_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 76b78c0..3e70708 100644 (file)
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-device-bridge.h"
 #include "nm-logging.h"

diff --git a/src/devices/nm-device-bridge.h b/src/devices/nm-device-bridge.h
index c11a2c4..e30c48c 100644 (file)
--- a/src/devices/nm-device-bridge.h
+++ b/src/devices/nm-device-bridge.h
@@ -21,8 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__
 #define __NETWORKMANAGER_DEVICE_BRIDGE_H__
 
-#include <glib-object.h>
-
+#include "nm-glib.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 585f6a0..7c226f0 100644 (file)
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -19,10 +19,10 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <nm-connection.h>
+#include "nm-glib.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 5848f7e..1ca181b 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.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 d147b1c..afd3a43 100644 (file)
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <netinet/in.h>
 #include <string.h>
@@ -31,7 +30,7 @@
 
 #include <gudev/gudev.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-activation-request.h"

diff --git a/src/devices/nm-device-ethernet.h b/src/devices/nm-device-ethernet.h
index ad9ce85..325225a 100644 (file)
--- a/src/devices/nm-device-ethernet.h
+++ b/src/devices/nm-device-ethernet.h
@@ -22,8 +22,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_ETHERNET_H__
 #define __NETWORKMANAGER_DEVICE_ETHERNET_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-factory.h b/src/devices/nm-device-factory.h
index 6ae865a..1ac1fc9 100644 (file)
--- a/src/devices/nm-device-factory.h
+++ b/src/devices/nm-device-factory.h
@@ -21,9 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_FACTORY_H__
 #define __NETWORKMANAGER_DEVICE_FACTORY_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include "nm-dbus-interface.h"
 #include "nm-device.h"
 

diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index 5841d83..0565153 100644 (file)
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -24,7 +24,6 @@
 #include "nm-device-private.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-manager.h"
 #include "nm-core-internal.h"
 

diff --git a/src/devices/nm-device-generic.h b/src/devices/nm-device-generic.h
index c889b1d..4dad442 100644 (file)
--- a/src/devices/nm-device-generic.h
+++ b/src/devices/nm-device-generic.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_GENERIC_H__
 #define __NETWORKMANAGER_DEVICE_GENERIC_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-gre.h b/src/devices/nm-device-gre.h
index 7acff5f..7e2d105 100644 (file)
--- a/src/devices/nm-device-gre.h
+++ b/src/devices/nm-device-gre.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_GRE_H__
 #define __NETWORKMANAGER_DEVICE_GRE_H__
 
-#include <glib-object.h>
-
 #include "nm-device-generic.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 2e2483c..62fbe8d 100644 (file)
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <linux/if_infiniband.h>
 
+#include "nm-glib.h"
 #include "nm-device-infiniband.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"
@@ -39,7 +39,6 @@
 
 #include "nm-device-infiniband-glue.h"
 
-
 G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
 
 #define NM_DEVICE_INFINIBAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_INFINIBAND, NMDeviceInfinibandPrivate))

diff --git a/src/devices/nm-device-infiniband.h b/src/devices/nm-device-infiniband.h
index b81b762..cac9a79 100644 (file)
--- a/src/devices/nm-device-infiniband.h
+++ b/src/devices/nm-device-infiniband.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_INFINIBAND_H__
 #define __NETWORKMANAGER_DEVICE_INFINIBAND_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-macvlan.h b/src/devices/nm-device-macvlan.h
index 24f1543..189a9df 100644 (file)
--- a/src/devices/nm-device-macvlan.h
+++ b/src/devices/nm-device-macvlan.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_MACVLAN_H__
 #define __NETWORKMANAGER_DEVICE_MACVLAN_H__
 
-#include <glib-object.h>
-
 #include "nm-device-generic.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-tun.h b/src/devices/nm-device-tun.h
index 393c580..b253d68 100644 (file)
--- a/src/devices/nm-device-tun.h
+++ b/src/devices/nm-device-tun.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_TUN_H__
 #define __NETWORKMANAGER_DEVICE_TUN_H__
 
-#include <glib-object.h>
-
 #include "nm-device-generic.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-veth.h b/src/devices/nm-device-veth.h
index 51e8db4..c7b8ec3 100644 (file)
--- a/src/devices/nm-device-veth.h
+++ b/src/devices/nm-device-veth.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_VETH_H__
 #define __NETWORKMANAGER_DEVICE_VETH_H__
 
-#include <glib-object.h>
-
 #include "nm-device-ethernet.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index 158e7de..f2380e7 100644 (file)
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <sys/socket.h>
 
+#include "nm-glib.h"
 #include "nm-device-vlan.h"
 #include "nm-manager.h"
 #include "nm-logging.h"

diff --git a/src/devices/nm-device-vlan.h b/src/devices/nm-device-vlan.h
index 20fc345..4a27226 100644 (file)
--- a/src/devices/nm-device-vlan.h
+++ b/src/devices/nm-device-vlan.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_VLAN_H__
 #define __NETWORKMANAGER_DEVICE_VLAN_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device-vxlan.h b/src/devices/nm-device-vxlan.h
index cc6081e..9db78cd 100644 (file)
--- a/src/devices/nm-device-vxlan.h
+++ b/src/devices/nm-device-vxlan.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_VXLAN_H__
 #define __NETWORKMANAGER_DEVICE_VXLAN_H__
 
-#include <glib-object.h>
-
 #include "nm-device-generic.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 985b0c6..4590c5f 100644 (file)
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
@@ -36,8 +35,8 @@
 #include <fcntl.h>
 #include <netlink/route/addr.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-device.h"
 #include "nm-device-private.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 469d755..cb44764 100644 (file)
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -22,11 +22,10 @@
 #ifndef __NETWORKMANAGER_DEVICE_H__
 #define __NETWORKMANAGER_DEVICE_H__
 
-#include <glib-object.h>
-#include <gio/gio.h>
 #include <dbus/dbus-glib.h>
 #include <netinet/in.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-types.h"
 #include "nm-connection.h"

diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index ccfab0f..1de2213 100644 (file)
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -24,12 +24,11 @@
 #include <unistd.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 #include <teamdctl.h>
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "nm-device-team.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h
index 26ba573..76cdba1 100644 (file)
--- a/src/devices/team/nm-device-team.h
+++ b/src/devices/team/nm-device-team.h
@@ -21,8 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
 #define __NETWORKMANAGER_DEVICE_TEAM_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/team/nm-team-factory.h b/src/devices/team/nm-team-factory.h
index 2f02ac5..35cee90 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 e67d1a2..7dc7c11 100644 (file)
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -26,7 +26,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
@@ -38,6 +37,7 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-device.h"
 #include "nm-device-wifi.h"
 #include "nm-device-olpc-mesh.h"
@@ -57,7 +57,6 @@
 /* This is a bug; but we can't really change API now... */
 #include "nm-vpn-dbus-interface.h"
 
-
 #include "nm-device-olpc-mesh-glue.h"
 
 #include "nm-device-logging.h"

diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/devices/wifi/nm-device-olpc-mesh.h
index 67d83fb..8d6895f 100644 (file)
--- a/src/devices/wifi/nm-device-olpc-mesh.h
+++ b/src/devices/wifi/nm-device-olpc-mesh.h
@@ -28,8 +28,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
 #define __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 500fa3a..62c64a1 100644 (file)
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <netinet/in.h>
@@ -29,7 +28,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-dbus-manager.h"
 #include "nm-device.h"
 #include "nm-device-wifi.h"
@@ -57,7 +56,6 @@
 #include "nm-wifi-enum-types.h"
 #include "nm-connection-provider.h"
 
-
 static gboolean impl_device_get_access_points (NMDeviceWifi *device,
                                                GPtrArray **aps,
                                                GError **err);

diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h
index bcba91d..c74ff1c 100644 (file)
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/devices/wifi/nm-device-wifi.h
@@ -22,8 +22,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_WIFI_H__
 #define __NETWORKMANAGER_DEVICE_WIFI_H__
 
-#include <glib-object.h>
-
 #include "nm-device.h"
 #include "nm-wifi-ap.h"
 

diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index ea4ec2a..ca272a0 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "nm-wifi-ap.h"
 #include "nm-wifi-ap-utils.h"
 #include "NetworkManagerUtils.h"
@@ -33,7 +34,6 @@
 #include "nm-core-internal.h"
 
 #include "nm-setting-wireless.h"
-#include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
 #include "nm-access-point-glue.h"

diff --git a/src/devices/wifi/nm-wifi-ap.h b/src/devices/wifi/nm-wifi-ap.h
index dfc5ace..47e901e 100644 (file)
--- a/src/devices/wifi/nm-wifi-ap.h
+++ b/src/devices/wifi/nm-wifi-ap.h
@@ -22,8 +22,7 @@
 #ifndef __NETWORKMANAGER_ACCESS_POINT_H__
 #define __NETWORKMANAGER_ACCESS_POINT_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-connection.h"
 

diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c
index b59b537..b7323b8 100644 (file)
--- a/src/devices/wifi/tests/test-wifi-ap-utils.c
+++ b/src/devices/wifi/tests/test-wifi-ap-utils.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-wifi-ap-utils.h"
 #include "nm-dbus-glib-types.h"
 

diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index ca724c0..02b0e5a 100644 (file)
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -21,8 +21,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "nm-device-modem.h"
 #include "nm-modem.h"
 #include "nm-device-private.h"

diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index 996195c..1cf399e 100644 (file)
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -21,9 +21,6 @@
 #ifndef __NETWORKMANAGER_DEVICE_MODEM_H__
 #define __NETWORKMANAGER_DEVICE_MODEM_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include "nm-device.h"
 #include "nm-modem.h"
 

diff --git a/src/devices/wwan/nm-modem-broadband.h b/src/devices/wwan/nm-modem-broadband.h
index 2268bac..a54e63a 100644 (file)
--- a/src/devices/wwan/nm-modem-broadband.h
+++ b/src/devices/wwan/nm-modem-broadband.h
@@ -21,7 +21,6 @@
 #ifndef __NETWORKMANAGER_MODEM_BROADBAND_H__
 #define __NETWORKMANAGER_MODEM_BROADBAND_H__
 
-#include <glib-object.h>
 #include "nm-modem.h"
 
 G_BEGIN_DECLS

diff --git a/src/devices/wwan/nm-modem-manager.h b/src/devices/wwan/nm-modem-manager.h
index 9e0db41..b0014c6 100644 (file)
--- a/src/devices/wwan/nm-modem-manager.h
+++ b/src/devices/wwan/nm-modem-manager.h
@@ -23,7 +23,6 @@
 #ifndef __NETWORKMANAGER_MODEM_MANAGER_H__
 #define __NETWORKMANAGER_MODEM_MANAGER_H__
 
-#include <glib-object.h>
 #include "nm-modem.h"
 
 #define NM_TYPE_MODEM_MANAGER (nm_modem_manager_get_type ())

diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index 2cace89..0889f72 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "nm-device.h"
 

diff --git a/src/devices/wwan/nm-wwan-factory.h b/src/devices/wwan/nm-wwan-factory.h
index c6c03f1..fc85a92 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 27945f5..b560724 100644 (file)
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -4,6 +4,7 @@ nm_dhcp_helper_SOURCES = nm-dhcp-helper.c
 
 nm_dhcp_helper_CPPFLAGS = \
        $(GLIB_CFLAGS) \
+       -I$(top_srcdir)/include \
        -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 67be01c..c00782f 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -29,6 +28,7 @@
 #include <stdlib.h>
 #include <uuid/uuid.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-logging.h"

diff --git a/src/dhcp-manager/nm-dhcp-client.h b/src/dhcp-manager/nm-dhcp-client.h
index 0cbd200..b5f30c5 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-client.h
+++ b/src/dhcp-manager/nm-dhcp-client.h
@@ -19,14 +19,13 @@
 #ifndef __NETWORKMANAGER_DHCP_CLIENT_H__
 #define __NETWORKMANAGER_DHCP_CLIENT_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-ip6-config.h>
 #include <nm-ip4-config.h>
 #include <nm-ip6-config.h>
 
+#include "nm-glib.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))
 #define NM_DHCP_CLIENT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DHCP_CLIENT, NMDhcpClientClass))

diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index cec6d13..4c889e7 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <ctype.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
 #include "nm-ip4-config.h"

diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.h b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
index 3cd0f8b..70ad7a1 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.h
@@ -19,12 +19,11 @@
 #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
 #define __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include <nm-setting-ip4-config.h>
 #include <nm-setting-ip6-config.h>
 
+#include "nm-glib.h"
+
 char *nm_dhcp_dhclient_create_config (const char *interface,
                                       gboolean is_ip6,
                                       GBytes *client_id,

diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 1d88da4..d6dde54 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -24,9 +24,7 @@
 #include <time.h>
 #undef _XOPEN_SOURCE
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -36,6 +34,7 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-dhclient.h"
 #include "nm-utils.h"
 #include "nm-logging.h"
@@ -44,7 +43,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-listener.h"
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.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 5abcc08..dba9011 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhclient.h
+++ b/src/dhcp-manager/nm-dhcp-dhclient.h
@@ -19,9 +19,7 @@
 #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_H__
 #define __NETWORKMANAGER_DHCP_DHCLIENT_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
+#include "nm-glib.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 acbc762..716ec84 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <stdlib.h>
@@ -33,13 +32,13 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.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"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (NMDhcpDhcpcd, nm_dhcp_dhcpcd, NM_TYPE_DHCP_CLIENT)
 

diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.h b/src/dhcp-manager/nm-dhcp-dhcpcd.h
index deed70e..6f15ad2 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.h
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.h
@@ -19,9 +19,6 @@
 #ifndef __NETWORKMANAGER_DHCP_DHCPCD_H__
 #define __NETWORKMANAGER_DHCP_DHCPCD_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include "nm-dhcp-client.h"
 
 #define NM_TYPE_DHCP_DHCPCD            (nm_dhcp_dhcpcd_get_type ())

diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c
index 7855f68..dde95aa 100644 (file)
--- 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 <gio/gio.h>
+#include "nm-glib.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 ca57ae5..4954d57 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-listener.c
+++ b/src/dhcp-manager/nm-dhcp-listener.c
@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
 #include <sys/socket.h>
@@ -30,12 +29,12 @@
 #include <errno.h>
 #include <unistd.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-listener.h"
 #include "nm-core-internal.h"
 #include "nm-logging.h"
 #include "nm-dbus-manager.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client"

diff --git a/src/dhcp-manager/nm-dhcp-listener.h b/src/dhcp-manager/nm-dhcp-listener.h
index 15ec053..015c8eb 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-listener.h
+++ b/src/dhcp-manager/nm-dhcp-listener.h
@@ -19,8 +19,7 @@
 #ifndef __NETWORKMANAGER_DHCP_LISTENER_H__
 #define __NETWORKMANAGER_DHCP_LISTENER_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.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 fa562e6..0f2b8fa 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -22,7 +22,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
@@ -34,6 +33,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-manager.h"
 #include "nm-dhcp-dhclient.h"
 #include "nm-dhcp-dhcpcd.h"
@@ -41,7 +41,6 @@
 #include "nm-logging.h"
 #include "nm-config.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "NetworkManagerUtils.h"
 
 #define DHCP_TIMEOUT 45 /* default DHCP timeout, in seconds */

diff --git a/src/dhcp-manager/nm-dhcp-manager.h b/src/dhcp-manager/nm-dhcp-manager.h
index 4c9e45d..4286d9f 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-manager.h
+++ b/src/dhcp-manager/nm-dhcp-manager.h
@@ -22,9 +22,8 @@
 #ifndef __NETWORKMANAGER_DHCP_MANAGER_H__
 #define __NETWORKMANAGER_DHCP_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.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 44a0d49..1ad68a5 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -18,9 +18,7 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -31,6 +29,7 @@
 #include <ctype.h>
 #include <net/if_arp.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-systemd.h"
 #include "nm-utils.h"
 #include "nm-logging.h"

diff --git a/src/dhcp-manager/nm-dhcp-systemd.h b/src/dhcp-manager/nm-dhcp-systemd.h
index 2a7a463..ff24bfc 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-systemd.h
+++ b/src/dhcp-manager/nm-dhcp-systemd.h
@@ -19,9 +19,6 @@
 #ifndef NM_DHCP_SYSTEMD_H
 #define NM_DHCP_SYSTEMD_H
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include "nm-dhcp-client.h"
 
 #define NM_TYPE_DHCP_SYSTEMD            (nm_dhcp_systemd_get_type ())

diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c
index 4dde1a4..85fd257 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-utils.c
+++ b/src/dhcp-manager/nm-dhcp-utils.c
@@ -19,12 +19,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-dhcp-utils.h"
 #include "nm-utils.h"

diff --git a/src/dhcp-manager/nm-dhcp-utils.h b/src/dhcp-manager/nm-dhcp-utils.h
index 42cf900..fd9e8e2 100644 (file)
--- a/src/dhcp-manager/nm-dhcp-utils.h
+++ b/src/dhcp-manager/nm-dhcp-utils.h
@@ -20,10 +20,12 @@
 #define __NETWORKMANAGER_DHCP_UTILS_H__
 
 #include <stdlib.h>
-#include <glib.h>
+
 #include <nm-ip4-config.h>
 #include <nm-ip6-config.h>
 
+#include "nm-glib.h"
+
 NMIP4Config *nm_dhcp_utils_ip4_config_from_options (int ifindex,
                                                     const char *iface,
                                                     GHashTable *options,

diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index df5eed3..14fbe4f 100644 (file)
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-dhclient-utils.h"

diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c
index 3cdae73..3bc8798 100644 (file)
--- a/src/dhcp-manager/tests/test-dhcp-utils.c
+++ b/src/dhcp-manager/tests/test-dhcp-utils.c
@@ -19,13 +19,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-dhcp-utils.h"
 #include "nm-logging.h"
 #include "nm-platform.h"

diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index f26ccfa..d71a0eb 100644 (file)
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -27,9 +27,9 @@
 #include <arpa/inet.h>
 #include <sys/stat.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "nm-dns-dnsmasq.h"
 #include "nm-utils.h"
 #include "nm-logging.h"

diff --git a/src/dns-manager/nm-dns-dnsmasq.h b/src/dns-manager/nm-dns-dnsmasq.h
index fc80f07..f0393c1 100644 (file)
--- a/src/dns-manager/nm-dns-dnsmasq.h
+++ b/src/dns-manager/nm-dns-dnsmasq.h
@@ -19,9 +19,6 @@
 #ifndef __NETWORKMANAGER_DNS_DNSMASQ_H__
 #define __NETWORKMANAGER_DNS_DNSMASQ_H__
 
-#include <glib.h>
-#include <glib-object.h>
-
 #include "nm-dns-plugin.h"
 
 #define NM_TYPE_DNS_DNSMASQ            (nm_dns_dnsmasq_get_type ())

diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index ac4a050..59cddb9 100644 (file)
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -35,10 +35,9 @@
 
 #include <linux/fs.h>
 
-#include <glib.h>
-#include <gio/gio.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-dns-manager.h"

diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
index a3e6cb2..ef1272b 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 5b95d1c..c384c66 100644 (file)
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -24,8 +24,8 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "nm-dns-plugin.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/dns-manager/nm-dns-plugin.h b/src/dns-manager/nm-dns-plugin.h
index ee735a5..3e7ce5b 100644 (file)
--- a/src/dns-manager/nm-dns-plugin.h
+++ b/src/dns-manager/nm-dns-plugin.h
@@ -19,8 +19,7 @@
 #ifndef __NETWORKMANAGER_DNS_PLUGIN_H__
 #define __NETWORKMANAGER_DNS_PLUGIN_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.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/dns-manager/nm-dns-unbound.h b/src/dns-manager/nm-dns-unbound.h
index 261326b..abc056b 100644 (file)
--- a/src/dns-manager/nm-dns-unbound.h
+++ b/src/dns-manager/nm-dns-unbound.h
@@ -18,8 +18,6 @@
 #ifndef __NETWORKMANAGER_DNS_UNBOUND_H__
 #define __NETWORKMANAGER_DNS_UNBOUND_H__
 
-#include <glib-object.h>
-
 #include "nm-dns-plugin.h"
 
 #define NM_TYPE_DNS_UNBOUND            (nm_dns_unbound_get_type ())

diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index dfe776c..ea4a2b2 100644 (file)
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -28,10 +28,10 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "nm-dnsmasq-manager.h"
 #include "nm-dnsmasq-utils.h"
 #include "nm-logging.h"
-#include "nm-glib-compat.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 257cc75..4b43658 100644 (file)
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.h
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_DNSMASQ_MANAGER_H__
 #define __NETWORKMANAGER_DNSMASQ_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.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 bb468c8..ed0b9eb 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.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 fae4cae..e36500d 100644 (file)
--- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-dnsmasq-utils.h"
 #include "nm-logging.h"
 

diff --git a/src/main-utils.c b/src/main-utils.c
index b0d8df3..94437b8 100644 (file)
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -29,13 +29,11 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <glib-unix.h>
 #include <gmodule.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/main-utils.h b/src/main-utils.h
index 4955029..af68568 100644 (file)
--- a/src/main-utils.h
+++ b/src/main-utils.h
@@ -21,7 +21,7 @@
 #ifndef __MAIN_UTILS_H__
 #define __MAIN_UTILS_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 void     nm_main_utils_ensure_root (void);
 

diff --git a/src/main.c b/src/main.c
index 27babf8..31f63b7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
@@ -40,6 +39,7 @@
 #include <string.h>
 #include <sys/resource.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/nm-activation-request.h b/src/nm-activation-request.h
index 6975606..62b4f62 100644 (file)
--- a/src/nm-activation-request.h
+++ b/src/nm-activation-request.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_ACTIVATION_REQUEST_H__
 #define __NETWORKMANAGER_ACTIVATION_REQUEST_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.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 b0bdd77..4c449d1 100644 (file)
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -20,8 +20,8 @@
 
 #include "config.h"
 
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-active-connection.h"
 #include "nm-dbus-interface.h"
@@ -35,7 +35,6 @@
 #include "NetworkManagerUtils.h"
 #include "gsystem-local-alloc.h"
 #include "nm-active-connection-glue.h"
-#include "nm-glib-compat.h"
 
 /* Base class for anything implementing the Connection.Active D-Bus interface */
 G_DEFINE_ABSTRACT_TYPE (NMActiveConnection, nm_active_connection, G_TYPE_OBJECT)

diff --git a/src/nm-active-connection.h b/src/nm-active-connection.h
index 4db5e6f..01568c8 100644 (file)
--- a/src/nm-active-connection.h
+++ b/src/nm-active-connection.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 #define __NETWORKMANAGER_ACTIVE_CONNECTION_H__
 
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-connection.h"
 

diff --git a/src/nm-auth-manager.h b/src/nm-auth-manager.h
index cc3b5d3..4589651 100644 (file)
--- a/src/nm-auth-manager.h
+++ b/src/nm-auth-manager.h
@@ -21,8 +21,8 @@
 #ifndef NM_AUTH_MANAGER_H
 #define NM_AUTH_MANAGER_H
 
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-auth-subject.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index c67424e..12dcee0 100644 (file)
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -32,11 +32,10 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-manager.h"
 #include "nm-enum-types.h"
-#include "nm-glib-compat.h"
 #include "NetworkManagerUtils.h"
 #include "gsystem-local-alloc.h"
 

diff --git a/src/nm-auth-subject.h b/src/nm-auth-subject.h
index cc004fa..6f48986 100644 (file)
--- a/src/nm-auth-subject.h
+++ b/src/nm-auth-subject.h
@@ -22,11 +22,10 @@
 #define __NETWORKMANAGER_AUTH_SUBJECT_H__
 
 #include <config.h>
-#include <glib.h>
-#include <glib-object.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_AUTH_SUBJECT            (nm_auth_subject_get_type ())

diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 1e14c7b..1a56f19 100644 (file)
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -21,8 +21,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-setting-connection.h"
 #include "nm-auth-utils.h"

diff --git a/src/nm-auth-utils.h b/src/nm-auth-utils.h
index 138c616..bf571ac 100644 (file)
--- a/src/nm-auth-utils.h
+++ b/src/nm-auth-utils.h
@@ -21,10 +21,10 @@
 #ifndef __NETWORKMANAGER_MANAGER_AUTH_H__
 #define __NETWORKMANAGER_MANAGER_AUTH_H__
 
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 
 #include <nm-connection.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_AUTH_PERMISSION_ENABLE_DISABLE_NETWORK     "org.freedesktop.NetworkManager.enable-disable-network"

diff --git a/src/nm-config-data.h b/src/nm-config-data.h
index 36aa66a..052a6b2 100644 (file)
--- a/src/nm-config-data.h
+++ b/src/nm-config-data.h
@@ -21,9 +21,8 @@
 #ifndef NM_CONFIG_DATA_H
 #define NM_CONFIG_DATA_H
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-config.c b/src/nm-config.c
index 3490959..aa0e05a 100644 (file)
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -24,10 +24,12 @@
 #include <string.h>
 #include <stdio.h>
 
+#include <glib/gi18n.h>
+
+#include "nm-glib.h"
 #include "nm-config.h"
 #include "nm-logging.h"
 #include "nm-utils.h"
-#include "nm-glib-compat.h"
 #include "nm-device.h"
 #include "NetworkManagerUtils.h"
 #include "gsystem-local-alloc.h"
@@ -35,9 +37,6 @@
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
 
-#include <gio/gio.h>
-#include <glib/gi18n.h>
-
 #define DEFAULT_CONFIG_MAIN_FILE        NMCONFDIR "/NetworkManager.conf"
 #define DEFAULT_CONFIG_DIR              NMCONFDIR "/conf.d"
 #define DEFAULT_CONFIG_MAIN_FILE_OLD    NMCONFDIR "/nm-system-settings.conf"

diff --git a/src/nm-config.h b/src/nm-config.h
index 870d4e4..2eece45 100644 (file)
--- a/src/nm-config.h
+++ b/src/nm-config.h
@@ -22,9 +22,8 @@
 #ifndef __NETWORKMANAGER_CONFIG_H__
 #define __NETWORKMANAGER_CONFIG_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-config-data.h"
 

diff --git a/src/nm-connection-provider.h b/src/nm-connection-provider.h
index 8d5f7a6..31b654f 100644 (file)
--- a/src/nm-connection-provider.h
+++ b/src/nm-connection-provider.h
@@ -16,9 +16,9 @@
 #ifndef __NETWORKMANAGER_CONNECTION_PROVIDER_H__
 #define __NETWORKMANAGER_CONNECTION_PROVIDER_H__
 
-#include <glib-object.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_CONNECTION_PROVIDER      (nm_connection_provider_get_type ())

diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index d3f9f25..e8b854c 100644 (file)
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -26,8 +26,8 @@
 #include <libsoup/soup.h>
 #endif
 
-#include "nm-glib-compat.h"
 
+#include "nm-glib.h"
 #include "nm-connectivity.h"
 #include "nm-config.h"
 #include "nm-logging.h"

diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index fc584d5..66e943c 100644 (file)
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -21,10 +21,8 @@
 #ifndef __NETWORKMANAGER_CONNECTIVITY_H__
 #define __NETWORKMANAGER_CONNECTIVITY_H__
 
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-types.h"
 

diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index 4f3ea07..0a664b0 100644 (file)
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -26,9 +26,9 @@
 #include <sys/types.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
-#include "nm-glib-compat.h"
 #include "nm-properties-changed-signal.h"
 
 #include <dbus/dbus.h>

diff --git a/src/nm-dbus-manager.h b/src/nm-dbus-manager.h
index c87ee02..a0e3121 100644 (file)
--- a/src/nm-dbus-manager.h
+++ b/src/nm-dbus-manager.h
@@ -23,10 +23,10 @@
 #define __NM_DBUS_MANAGER_H__
 
 #include <config.h>
-#include <glib-object.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index 8bf3858..b5a1346 100644 (file)
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -23,7 +23,7 @@
 #include <sys/wait.h>
 #include <string.h>
 
-#include <glib.h>
+#include "nm-glib.h"
 #include "nm-dcb.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/nm-dcb.h b/src/nm-dcb.h
index e409dd4..e12fa18 100644 (file)
--- a/src/nm-dcb.h
+++ b/src/nm-dcb.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DCB_H__
 #define __NETWORKMANAGER_DCB_H__
 
-#include <glib.h>
+#include "nm-glib.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.h b/src/nm-default-route-manager.h
index 7fc27bb..4c1b032 100644 (file)
--- a/src/nm-default-route-manager.h
+++ b/src/nm-default-route-manager.h
@@ -18,8 +18,8 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-types.h"
 

diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index 096cf16..ae945fd 100644 (file)
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp4-config.h"
@@ -30,7 +30,6 @@
 #include "nm-dbus-glib-types.h"
 #include "nm-utils.h"
 
-
 G_DEFINE_TYPE (NMDhcp4Config, nm_dhcp4_config, G_TYPE_OBJECT)
 
 #define NM_DHCP4_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP4_CONFIG, NMDhcp4ConfigPrivate))

diff --git a/src/nm-dhcp4-config.h b/src/nm-dhcp4-config.h
index 227d448..c7f3797 100644 (file)
--- a/src/nm-dhcp4-config.h
+++ b/src/nm-dhcp4-config.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_DHCP4_CONFIG_H__
 #define __NETWORKMANAGER_DHCP4_CONFIG_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_DHCP4_CONFIG            (nm_dhcp4_config_get_type ())

diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index f93e964..f96807c 100644 (file)
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-dbus-manager.h"
 #include "nm-dhcp6-config.h"
@@ -30,7 +30,6 @@
 #include "nm-dbus-glib-types.h"
 #include "nm-utils.h"
 
-
 G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, G_TYPE_OBJECT)
 
 #define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigPrivate))

diff --git a/src/nm-dhcp6-config.h b/src/nm-dhcp6-config.h
index eaca61b..53d8b52 100644 (file)
--- a/src/nm-dhcp6-config.h
+++ b/src/nm-dhcp6-config.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_DHCP6_CONFIG_H__
 #define __NETWORKMANAGER_DHCP6_CONFIG_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_DHCP6_CONFIG            (nm_dhcp6_config_get_type ())

diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index eede058..8adec92 100644 (file)
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -21,11 +21,10 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <gio/gio.h>
 #include <string.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-dispatcher.h"
 #include "nm-dispatcher-api.h"
 #include "NetworkManagerUtils.h"
@@ -38,7 +37,6 @@
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-settings-connection.h"
 #include "nm-platform.h"
 #include "nm-core-internal.h"

diff --git a/src/nm-dispatcher.h b/src/nm-dispatcher.h
index e93816b..d4ea329 100644 (file)
--- a/src/nm-dispatcher.h
+++ b/src/nm-dispatcher.h
@@ -22,9 +22,9 @@
 #ifndef __NETWORKMANAGER_DISPATCHER_H__
 #define __NETWORKMANAGER_DISPATCHER_H__
 
-#include <glib.h>
 #include <stdio.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-connection.h"
 

diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 9bffac7..304ee7e 100644 (file)
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -21,9 +21,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-firewall-manager.h"
 #include "nm-logging.h"
 #include "gsystem-local-alloc.h"

diff --git a/src/nm-firewall-manager.h b/src/nm-firewall-manager.h
index 84cb549..6423cbb 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 bec6cc8..8fd5749 100644 (file)
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib-unix.h>
 #include <getopt.h>
 #include <locale.h>
@@ -38,6 +37,7 @@
  * Forward declare if_nametoindex. */
 extern unsigned int if_nametoindex (const char *__ifname);
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "NetworkManagerUtils.h"
 #include "nm-linux-platform.h"

diff --git a/src/nm-ip4-config.h b/src/nm-ip4-config.h
index 4415c45..753b74c 100644 (file)
--- a/src/nm-ip4-config.h
+++ b/src/nm-ip4-config.h
@@ -21,8 +21,8 @@
 #ifndef __NETWORKMANAGER_IP4_CONFIG_H__
 #define __NETWORKMANAGER_IP4_CONFIG_H__
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-setting-ip4-config.h"
 

diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 1cedff5..2122f64 100644 (file)
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -24,9 +24,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-ip6-config.h"
 
-#include "nm-glib-compat.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "nm-dbus-manager.h"

diff --git a/src/nm-ip6-config.h b/src/nm-ip6-config.h
index e8cbc0e..0691902 100644 (file)
--- a/src/nm-ip6-config.h
+++ b/src/nm-ip6-config.h
@@ -21,9 +21,9 @@
 #ifndef __NETWORKMANAGER_IP6_CONFIG_H__
 #define __NETWORKMANAGER_IP6_CONFIG_H__
 
-#include <glib-object.h>
 #include <netinet/in.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-setting-ip6-config.h"
 

diff --git a/src/nm-logging.c b/src/nm-logging.c
index eed89de..9059877 100644 (file)
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -39,7 +39,7 @@
 #include <systemd/sd-journal.h>
 #endif
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-errors.h"
 #include "gsystem-local-alloc.h"

diff --git a/src/nm-logging.h b/src/nm-logging.h
index c34ef45..6681259 100644 (file)
--- a/src/nm-logging.h
+++ b/src/nm-logging.h
@@ -26,9 +26,8 @@
 #error nm-test-utils.h must be included as last header
 #endif
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-macros-internal.h"
 
 /* Log domains */

diff --git a/src/nm-manager.c b/src/nm-manager.c
index d8072d1..9a035c0 100644 (file)
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -28,11 +28,10 @@
 #include <unistd.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus-glib.h>
-#include <gio/gio.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-manager.h"
 #include "nm-logging.h"
 #include "nm-dbus-manager.h"

diff --git a/src/nm-manager.h b/src/nm-manager.h
index a8e7d7a..665a8dd 100644 (file)
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -22,9 +22,8 @@
 #ifndef __NETWORKMANAGER_MANAGER_H__
 #define __NETWORKMANAGER_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "nm-connection.h"
 

diff --git a/src/nm-multi-index.c b/src/nm-multi-index.c
index d45f483..8a7e4d1 100644 (file)
--- a/src/nm-multi-index.c
+++ b/src/nm-multi-index.c
@@ -20,14 +20,13 @@
 
 #include "config.h"
 
+#include "nm-glib.h"
 #include "nm-multi-index.h"
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
 #include "nm-macros-internal.h"
 
-
 struct NMMultiIndex {
        NMMultiIndexFuncEqual equal_fcn;
        NMMultiIndexFuncClone clone_fcn;

diff --git a/src/nm-multi-index.h b/src/nm-multi-index.h
index e41ef54..3438d1c 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/nm-policy.c b/src/nm-policy.c
index 69d12d7..ef8239a 100644 (file)
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -26,8 +26,8 @@
 #include <errno.h>
 #include <netdb.h>
 
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-policy.h"
 #include "NetworkManagerUtils.h"
 #include "nm-activation-request.h"
@@ -45,7 +45,6 @@
 #include "nm-dispatcher.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
-#include "nm-glib-compat.h"
 #include "nm-manager.h"
 #include "nm-settings.h"
 #include "nm-settings-connection.h"

diff --git a/src/nm-properties-changed-signal.h b/src/nm-properties-changed-signal.h
index 97a3b2c..6f76e8a 100644 (file)
--- a/src/nm-properties-changed-signal.h
+++ b/src/nm-properties-changed-signal.h
@@ -22,7 +22,7 @@
 #ifndef _NM_PROPERTIES_CHANGED_SIGNAL_H_
 #define _NM_PROPERTIES_CHANGED_SIGNAL_H_
 
-#include <glib-object.h>
+#include "nm-glib.h"
 
 void nm_properties_changed_signal_add_property (GType       type,
                                                 const char *dbus_property_name,

diff --git a/src/nm-rfkill-manager.h b/src/nm-rfkill-manager.h
index 220f3c2..cea6c7a 100644 (file)
--- a/src/nm-rfkill-manager.h
+++ b/src/nm-rfkill-manager.h
@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2013 Red Hat, Inc.
  */
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #ifndef __NETWORKMANAGER_RFKILL_MANAGER_H__

diff --git a/src/nm-route-manager.h b/src/nm-route-manager.h
index 1e4ce48..e72bce7 100644 (file)
--- a/src/nm-route-manager.h
+++ b/src/nm-route-manager.h
@@ -18,8 +18,8 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #ifndef __NETWORKMANAGER_ROUTE_MANAGER_H__

diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index 84436d0..8a12552 100644 (file)
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -25,9 +25,8 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <gio/gio.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-session-monitor.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/nm-session-monitor.h b/src/nm-session-monitor.h
index 32f747f..ef7bd51 100644 (file)
--- a/src/nm-session-monitor.h
+++ b/src/nm-session-monitor.h
@@ -21,8 +21,8 @@
 #ifndef __NETWORKMANAGER_SESSION_MONITOR_H__
 #define __NETWORKMANAGER_SESSION_MONITOR_H__
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
index 1e3a309..dab41a7 100644 (file)
--- a/src/nm-sleep-monitor-systemd.c
+++ b/src/nm-sleep-monitor-systemd.c
@@ -23,9 +23,9 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 #include <gio/gunixfdlist.h>
 
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-dbus-manager.h"
 #include "nm-core-internal.h"

diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
index a9abb08..e3599a2 100644 (file)
--- a/src/nm-sleep-monitor-upower.c
+++ b/src/nm-sleep-monitor-upower.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <gio/gio.h>
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "nm-core-internal.h"
 

diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
index 8462377..3f13d32 100644 (file)
--- a/src/nm-sleep-monitor.h
+++ b/src/nm-sleep-monitor.h
@@ -20,8 +20,8 @@
 #ifndef __NETWORKMANAGER_SLEEP_MONITOR_H__
 #define __NETWORKMANAGER_SLEEP_MONITOR_H__
 
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 16eb351..448101d 100644 (file)
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -21,13 +21,12 @@
 #ifndef __NETWORKMANAGER_PLATFORM_H__
 #define __NETWORKMANAGER_PLATFORM_H__
 
-#include <glib-object.h>
-#include "nm-glib-compat.h"
 #include <netinet/in.h>
 #include <linux/if.h>
 #include <linux/if_addr.h>
 
 #include <nm-dbus-interface.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 #include "NetworkManagerUtils.h"
 

diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c
index a989e63..933e124 100644 (file)
--- a/src/platform/tests/monitor.c
+++ b/src/platform/tests/monitor.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <syslog.h>
 
+#include "nm-glib.h"
 #include "nm-fake-platform.h"
 #include "nm-linux-platform.h"
 #include "nm-logging.h"
-#include "nm-glib-compat.h"
 
 int
 main (int argc, char **argv)

diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index 2a52de5..e427f33 100644 (file)
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -29,7 +29,6 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <glib.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -37,6 +36,7 @@
 
 #include <linux/nl80211.h>
 
+#include "nm-glib.h"
 #include "wifi-utils-private.h"
 #include "wifi-utils-nl80211.h"
 #include "nm-platform.h"

diff --git a/src/platform/wifi/wifi-utils-private.h b/src/platform/wifi/wifi-utils-private.h
index c334a82..9e5b206 100644 (file)
--- a/src/platform/wifi/wifi-utils-private.h
+++ b/src/platform/wifi/wifi-utils-private.h
@@ -21,8 +21,8 @@
 #ifndef __WIFI_UTILS_PRIVATE_H__
 #define __WIFI_UTILS_PRIVATE_H__
 
-#include <glib.h>
 
+#include "nm-glib.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 e58b72b..52d1e49 100644 (file)
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -28,8 +28,8 @@
 #include <unistd.h>
 #include <math.h>
 
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "wifi-utils-private.h"
 #include "wifi-utils-wext.h"
 #include "nm-logging.h"
@@ -44,7 +44,6 @@
 #include <sys/socket.h>
 #include <linux/wireless.h>
 
-
 typedef struct {
        WifiData parent;
        int fd;

diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c
index 69c8cbc..eab99bf 100644 (file)
--- a/src/platform/wifi/wifi-utils.c
+++ b/src/platform/wifi/wifi-utils.c
@@ -24,8 +24,8 @@
 #include <sys/stat.h>
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 
+#include "nm-glib.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 a2830dc..a5c9fea 100644 (file)
--- a/src/platform/wifi/wifi-utils.h
+++ b/src/platform/wifi/wifi-utils.h
@@ -23,8 +23,8 @@
 #define __WIFI_UTILS_H__
 
 #include <net/ethernet.h>
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 
 typedef struct WifiData WifiData;

diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 48c9ff2..6e1e5c2 100644 (file)
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -42,8 +42,8 @@
 #include <linux/if.h>
 #include <linux/if_ppp.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
-#include "nm-glib-compat.h"
 #include "nm-ppp-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-logging.h"

diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h
index f8cbda1..9528721 100644 (file)
--- a/src/ppp-manager/nm-ppp-manager.h
+++ b/src/ppp-manager/nm-ppp-manager.h
@@ -22,10 +22,8 @@
 #ifndef __NETWORKMANAGER_PPP_MANAGER_H__
 #define __NETWORKMANAGER_PPP_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-ppp-status.h"
 #include "nm-activation-request.h"
 #include "nm-connection.h"

diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 0a3bcca..9b07519 100644 (file)
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -29,16 +29,15 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dlfcn.h>
-#include <gio/gio.h>
 
 #define INET6
 #include <pppd/eui64.h>
 #include <pppd/ipv6cp.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-pppd-plugin.h"
 #include "nm-ppp-status.h"
-#include "nm-glib-compat.h"
 
 int plugin_init (void);
 

diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h
index 463e191..4c83fb4 100644 (file)
--- a/src/rdisc/nm-rdisc.h
+++ b/src/rdisc/nm-rdisc.h
@@ -21,11 +21,11 @@
 #ifndef __NETWORKMANAGER_RDISC_H__
 #define __NETWORKMANAGER_RDISC_H__
 
-#include <glib-object.h>
 
 #include <stdlib.h>
 #include <netinet/in.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 
 #define NM_TYPE_RDISC            (nm_rdisc_get_type ())

diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 99602d9..7da9ee5 100644 (file)
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -23,10 +23,10 @@
 #include <string.h>
 #include <pwd.h>
 
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-logging.h"
 #include "nm-agent-manager.h"

diff --git a/src/settings/nm-agent-manager.h b/src/settings/nm-agent-manager.h
index ac29df2..ab010ed 100644 (file)
--- a/src/settings/nm-agent-manager.h
+++ b/src/settings/nm-agent-manager.h
@@ -21,9 +21,8 @@
 #ifndef __NETWORKMANAGER_AGENT_MANAGER_H__
 #define __NETWORKMANAGER_AGENT_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include <nm-connection.h>
+#include "nm-glib.h"
 #include "nm-secret-agent.h"
 #include "nm-types.h"
 

diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c
index 2d0210a..2c4fe9e 100644 (file)
--- a/src/settings/nm-inotify-helper.c
+++ b/src/settings/nm-inotify-helper.c
@@ -23,9 +23,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <sys/inotify.h>
-#include <glib.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-inotify-helper.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/settings/nm-inotify-helper.h b/src/settings/nm-inotify-helper.h
index 31e6b9f..1dd73a5 100644 (file)
--- a/src/settings/nm-inotify-helper.h
+++ b/src/settings/nm-inotify-helper.h
@@ -21,10 +21,10 @@
 #ifndef __INOTIFY_HELPER_H__
 #define __INOTIFY_HELPER_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include <sys/inotify.h>
 
+#include "nm-glib.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 69a5cea..be21f16 100644 (file)
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -23,15 +23,14 @@
 #include <sys/types.h>
 #include <pwd.h>
 
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-secret-agent.h"
 #include "nm-dbus-manager.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-logging.h"
 #include "nm-auth-subject.h"
 #include "nm-simple-connection.h"

diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h
index f3f4ff8..ed49f93 100644 (file)
--- a/src/settings/nm-secret-agent.h
+++ b/src/settings/nm-secret-agent.h
@@ -21,10 +21,9 @@
 #ifndef __NETWORKMANAGER_SECRET_AGENT_H__
 #define __NETWORKMANAGER_SECRET_AGENT_H__
 
-#include <glib.h>
-#include <glib-object.h>
 
 #include <nm-connection.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_SECRET_AGENT            (nm_secret_agent_get_type ())

diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index c25dfac..24e9395 100644 (file)
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -26,6 +26,7 @@
 #include <nm-dbus-interface.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib.h"
 #include "nm-settings-connection.h"
 #include "nm-session-monitor.h"
 #include "nm-dbus-manager.h"
@@ -37,7 +38,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-properties-changed-signal.h"
 #include "nm-core-internal.h"
-#include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
 #define SETTINGS_TIMESTAMPS_FILE  NMSTATEDIR "/timestamps"

diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
index d196efe..2c163cb 100644 (file)
--- a/src/settings/nm-settings.h
+++ b/src/settings/nm-settings.h
@@ -28,6 +28,7 @@
 
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "nm-types.h"
 
 #define NM_TYPE_SETTINGS            (nm_settings_get_type ())

diff --git a/src/settings/nm-system-config-interface.h b/src/settings/nm-system-config-interface.h
index bc158d7..1dce931 100644 (file)
--- a/src/settings/nm-system-config-interface.h
+++ b/src/settings/nm-system-config-interface.h
@@ -22,9 +22,9 @@
 #ifndef __NETWORKMANAGER_SYSTEM_CONFIG_INTERFACE_H__
 #define __NETWORKMANAGER_SYSTEM_CONFIG_INTERFACE_H__
 
-#include <glib.h>
-#include <glib-object.h>
+
 #include <nm-connection.h>
+#include "nm-glib.h"
 #include "nm-types.h"
 
 G_BEGIN_DECLS

diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c
index 954929a..2c3504f 100644 (file)
--- a/src/settings/plugins/ibft/plugin.c
+++ b/src/settings/plugins/ibft/plugin.c
@@ -25,12 +25,11 @@
 #include <errno.h>
 
 #include <gmodule.h>
-#include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-system-config-interface.h"
 #include "nm-logging.h"

diff --git a/src/settings/plugins/ibft/plugin.h b/src/settings/plugins/ibft/plugin.h
index 2c81135..f9426fc 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 9bc6346..45006f7 100644 (file)
--- a/src/settings/plugins/ibft/reader.c
+++ b/src/settings/plugins/ibft/reader.c
@@ -31,9 +31,9 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/settings/plugins/ibft/reader.h b/src/settings/plugins/ibft/reader.h
index 0b2f22b..bea32e2 100644 (file)
--- a/src/settings/plugins/ibft/reader.h
+++ b/src/settings/plugins/ibft/reader.h
@@ -21,9 +21,10 @@
 #ifndef __READER_H__
 #define __READER_H__
 
-#include <glib.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
+
 gboolean read_ibft_blocks (const char *iscsiadm_path,
                            GSList **out_blocks,
                            GError **error);

diff --git a/src/settings/plugins/ifcfg-rh/common.h b/src/settings/plugins/ifcfg-rh/common.h
index 0ec355e..168177f 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.h"
 
 #define IFCFG_TAG "ifcfg-"
 #define KEYS_TAG "keys-"

diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index d33b41c..cef69c1 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -30,9 +30,7 @@
 #include <sys/stat.h>
 
 #include <gmodule.h>
-#include <glib-object.h>
 #include <glib/gi18n.h>
-#include <gio/gio.h>
 
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
@@ -44,6 +42,7 @@
 
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "common.h"
 #include "nm-dbus-glib-types.h"
 #include "plugin.h"

diff --git a/src/settings/plugins/ifcfg-rh/plugin.h b/src/settings/plugins/ifcfg-rh/plugin.h
index d37decf..2f757ed 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/plugin.h
+++ b/src/settings/plugins/ifcfg-rh/plugin.h
@@ -24,7 +24,7 @@
 #ifndef _PLUGIN_H_
 #define _PLUGIN_H_
 
-#include <glib-object.h>
+#include "nm-glib.h"
 
 #define SC_TYPE_PLUGIN_IFCFG            (sc_plugin_ifcfg_get_type ())
 #define SC_PLUGIN_IFCFG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SC_TYPE_PLUGIN_IFCFG, SCPluginIfcfg))

diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index ee407ea..69f08eb 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -31,7 +31,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <nm-connection.h>
 #include <nm-dbus-interface.h>
@@ -49,6 +48,7 @@
 #include <nm-setting-bridge-port.h>
 #include <nm-setting-dcb.h>
 #include <nm-setting-generic.h>
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include <nm-utils.h>
 

diff --git a/src/settings/plugins/ifcfg-rh/reader.h b/src/settings/plugins/ifcfg-rh/reader.h
index 2096ffc..a9f830f 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/reader.h
+++ b/src/settings/plugins/ifcfg-rh/reader.h
@@ -21,9 +21,9 @@
 #ifndef __READER_H__
 #define __READER_H__
 
-#include <glib.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "shvar.h"
 
 NMConnection *connection_from_file (const char *filename,

diff --git a/src/settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
index de7a358..1778206 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index a793288..4d38c9b 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
 #include "NetworkManagerUtils.h"

diff --git a/src/settings/plugins/ifcfg-rh/utils.h b/src/settings/plugins/ifcfg-rh/utils.h
index 547bfcb..d8b4784 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/utils.h
+++ b/src/settings/plugins/ifcfg-rh/utils.h
@@ -21,8 +21,8 @@
 #ifndef _UTILS_H_
 #define _UTILS_H_
 
-#include <glib.h>
 #include <nm-connection.h>
+#include "nm-glib.h"
 #include "shvar.h"
 #include "common.h"
 #include "nm-logging.h"

diff --git a/src/settings/plugins/ifcfg-rh/writer.h b/src/settings/plugins/ifcfg-rh/writer.h
index 894313d..2c7168d 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/writer.h
+++ b/src/settings/plugins/ifcfg-rh/writer.h
@@ -22,9 +22,11 @@
 #define _WRITER_H_
 
 #include <sys/types.h>
-#include <glib.h>
+
 #include <nm-connection.h>
 
+#include "nm-glib.h"
+
 gboolean writer_can_write_connection (NMConnection *connection,
                                       GError **error);
 

diff --git a/src/settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h
index d10979c..c696624 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.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 81d7380..332fdf5 100644 (file)
--- a/src/settings/plugins/ifnet/net_utils.c
+++ b/src/settings/plugins/ifnet/net_utils.c
@@ -30,7 +30,7 @@
 #include <nm-system-config-interface.h>
 #include <nm-logging.h>
 #include <nm-config.h>
-#include <gio/gio.h>
+#include "nm-glib.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 096f846..bcb265d 100644 (file)
--- a/src/settings/plugins/ifnet/net_utils.h
+++ b/src/settings/plugins/ifnet/net_utils.h
@@ -22,10 +22,10 @@
 #ifndef _IFNET_UTILS_H
 #define _IFNET_UTILS_H
 #define IFNET_PLUGIN_NAME "SCPlugin-Ifnet"
-#include <glib.h>
 #include <arpa/inet.h>
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-ip4-config.h>
+#include "nm-glib.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/plugin.c b/src/settings/plugins/ifnet/plugin.c
index 550f31a..b82a9d0 100644 (file)
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -25,12 +25,11 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <glib.h>
-#include <gio/gio.h>
 
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-interface.h"
 #include "nm-system-config-interface.h"
 #include "nm-logging.h"

diff --git a/src/settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h
index 6ac0f48..89e0fa3 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 72d7e27..18876e6 100644 (file)
--- a/src/settings/plugins/ifnet/tests/test-ifnet.c
+++ b/src/settings/plugins/ifnet/tests/test-ifnet.c
@@ -24,12 +24,12 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-linux-platform.h"
 #include "nm-logging.h"
 

diff --git a/src/settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h
index 3a0d377..9f2cf60 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.h"
 
 #define WPA_SUPPLICANT_CONF SYSCONFDIR "/wpa_supplicant/wpa_supplicant.conf"
 

diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h
index e68abcf..0b6c8c9 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.h"
 
 typedef struct _if_data
 {

diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
index be2ebc0..bc2df73 100644 (file)
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
@@ -25,6 +25,7 @@
 #define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__
 
 #include <nm-settings-connection.h>
+#include "nm-glib.h"
 #include "interface_parser.h"
 
 G_BEGIN_DECLS

diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index d67405b..f2a700c 100644 (file)
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -27,11 +27,10 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <glib-object.h>
 #include <glib/gi18n.h>
-#include <glib.h>
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "interface_parser.h"
 
 #include "nm-dbus-interface.h"

diff --git a/src/settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h
index 943b8b9..a9aa56f 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 d285a46..edadd28 100644 (file)
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-logging.h"
 #include "interface_parser.h"

diff --git a/src/settings/plugins/keyfile/common.h b/src/settings/plugins/keyfile/common.h
index 86fe002..871a745 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.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/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 71f407d..f34dc9f 100644 (file)
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -27,9 +27,7 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <glib.h>
 #include <glib/gstdio.h>
-#include <gio/gio.h>
 
 #include <nm-connection.h>
 #include <nm-setting.h>
@@ -37,6 +35,7 @@
 #include <nm-utils.h>
 #include <nm-config.h>
 #include <nm-logging.h>
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 
 #include "plugin.h"

diff --git a/src/settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h
index 4857978..4d77a92 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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.h b/src/settings/plugins/keyfile/reader.h
index 5581963..44bf55c 100644 (file)
--- a/src/settings/plugins/keyfile/reader.h
+++ b/src/settings/plugins/keyfile/reader.h
@@ -22,9 +22,10 @@
 #ifndef _KEYFILE_PLUGIN_READER_H
 #define _KEYFILE_PLUGIN_READER_H
 
-#include <glib.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
+
 NMConnection *nm_keyfile_plugin_connection_from_file (const char *filename, GError **error);
 
 #endif /* _KEYFILE_PLUGIN_READER_H */

diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
index 4809c64..1685e22 100644 (file)
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/utils.c
@@ -20,16 +20,15 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "utils.h"
 #include <nm-setting-wired.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 
-
 static const char temp_letters[] =
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 

diff --git a/src/settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h
index d086228..a4c1365 100644 (file)
--- 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 <glib.h>
+#include "nm-glib.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 e6ee7f9..d5c087d 100644 (file)
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -27,8 +27,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "nm-logging.h"
 #include "writer.h"
 #include "common.h"
@@ -36,7 +35,6 @@
 #include "nm-keyfile-internal.h"
 #include "gsystem-local-alloc.h"
 
-
 typedef struct {
        const char *keyfile_dir;
 } WriteInfo;

diff --git a/src/settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h
index 9588510..e7bb346 100644 (file)
--- a/src/settings/plugins/keyfile/writer.h
+++ b/src/settings/plugins/keyfile/writer.h
@@ -22,9 +22,10 @@
 #ifndef _KEYFILE_PLUGIN_WRITER_H
 #define _KEYFILE_PLUGIN_WRITER_H
 
-#include <glib.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
+
 gboolean nm_keyfile_plugin_write_connection (NMConnection *connection,
                                              const char *existing_path,
                                              gboolean force_rename,

diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index b78a24d..62fc8e0 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -23,9 +23,9 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <dbus/dbus-glib.h>
 
+#include "nm-glib.h"
 #include "nm-supplicant-config.h"
 #include "nm-supplicant-settings-verify.h"
 #include "nm-logging.h"

diff --git a/src/supplicant-manager/nm-supplicant-config.h b/src/supplicant-manager/nm-supplicant-config.h
index 3324f63..5b5356c 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-config.h
+++ b/src/supplicant-manager/nm-supplicant-config.h
@@ -22,10 +22,10 @@
 #ifndef __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
 #define __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
 
-#include <glib-object.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-setting-8021x.h>
+#include "nm-glib.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 d2361f5..50daabe 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -23,13 +23,12 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <glib.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-supplicant-interface.h"
 #include "nm-logging.h"
 #include "nm-supplicant-config.h"
-#include "nm-glib-compat.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 6be89f4..9d930f2 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.h"
 #include "nm-supplicant-types.h"
 
 /*
@@ -120,7 +120,6 @@ typedef struct {
                                     const char *message);
 } NMSupplicantInterfaceClass;
 
-
 GType nm_supplicant_interface_get_type (void);
 
 NMSupplicantInterface * nm_supplicant_interface_new (const char *ifname,

diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index 083f2eb..fff5c07 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -22,11 +22,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 #include <dbus/dbus.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
 #include "nm-logging.h"

diff --git a/src/supplicant-manager/nm-supplicant-manager.h b/src/supplicant-manager/nm-supplicant-manager.h
index 3b8fddf..0378a4e 100644 (file)
--- 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 <glib-object.h>
+#include "nm-glib.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 1328fd5..1114bef 100644 (file)
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -20,12 +20,12 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-supplicant-settings-verify.h"
 
 struct Opt {

diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index f9aff5d..39043ec 100644 (file)
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -22,9 +22,9 @@
 
 #include <unistd.h>
 
-#include <glib.h>
 
 #include <nm-config.h>
+#include "nm-glib.h"
 #include "nm-test-device.h"
 #include "nm-fake-platform.h"
 #include "nm-logging.h"

diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index 2fef34b..b6ca0b7 100644 (file)
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-dcb.h"
 #include "nm-logging.h"
 

diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c
index f671c15..e652abe 100644 (file)
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-general-with-expect.c
@@ -20,13 +20,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <errno.h>
 #include <netinet/ether.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-logging.h"
 #include "nm-multi-index.h"

diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index eda7a1f..129802d 100644 (file)
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-logging.h"
 #include "nm-core-internal.h"

diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 81295fa..0bf0506 100644 (file)
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
 #include "nm-logging.h"

diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index 421fa37..1bac506 100644 (file)
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "nm-ip6-config.h"
 
 #include "nm-logging.h"

diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c
index 313c23f..f8d3e9d 100644 (file)
--- a/src/tests/test-resolvconf-capture.c
+++ b/src/tests/test-resolvconf-capture.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <arpa/inet.h>
 
+#include "nm-glib.h"
 #include "NetworkManagerUtils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"

diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c
index 9b66c2d..6b31fe1 100644 (file)
--- a/src/tests/test-route-manager.c
+++ b/src/tests/test-route-manager.c
@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
 
+#include "nm-glib.h"
 #include "test-common.h"
 
 #include "nm-platform.h"

diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c
index 7e626ec..da693c9 100644 (file)
--- a/src/tests/test-wired-defname.c
+++ b/src/tests/test-wired-defname.c
@@ -20,11 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
-#include <glib-object.h>
 
 #include <nm-simple-connection.h>
 #include <nm-setting-connection.h>
+#include "nm-glib.h"
 #include "nm-device-ethernet-utils.h"
 #include "nm-logging.h"
 

diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index 8749e35..e6a2ca9 100644 (file)
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -29,6 +28,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
+#include "nm-glib.h"
 #include "nm-vpn-connection.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
@@ -38,7 +38,6 @@
 #include "nm-active-connection.h"
 #include "nm-dbus-glib-types.h"
 #include "NetworkManagerUtils.h"
-#include "nm-glib-compat.h"
 #include "settings/nm-settings-connection.h"
 #include "nm-dispatcher.h"
 #include "nm-agent-manager.h"

diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h
index 0e63caa..a6dc62d 100644 (file)
--- a/src/vpn-manager/nm-vpn-connection.h
+++ b/src/vpn-manager/nm-vpn-connection.h
@@ -22,8 +22,6 @@
 #ifndef __NETWORKMANAGER_VPN_CONNECTION_H__
 #define __NETWORKMANAGER_VPN_CONNECTION_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include "nm-vpn-dbus-interface.h"
 #include "nm-device.h"
 #include "nm-auth-subject.h"

diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 1de9b75..d3f959c 100644 (file)
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -22,8 +22,8 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-vpn-manager.h"
 #include "nm-vpn-service.h"
 #include "nm-vpn-connection.h"

diff --git a/src/vpn-manager/nm-vpn-manager.h b/src/vpn-manager/nm-vpn-manager.h
index b75a617..c7fe2b1 100644 (file)
--- a/src/vpn-manager/nm-vpn-manager.h
+++ b/src/vpn-manager/nm-vpn-manager.h
@@ -22,8 +22,7 @@
 #ifndef __NETWORKMANAGER_VPN_MANAGER_H__
 #define __NETWORKMANAGER_VPN_MANAGER_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.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 77220dd..3eb0e2e 100644 (file)
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -21,18 +21,17 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
 
+#include "nm-glib.h"
 #include "nm-vpn-service.h"
 #include "nm-dbus-manager.h"
 #include "nm-logging.h"
 #include "nm-vpn-manager.h"
-#include "nm-glib-compat.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 cafa690..6e93595 100644 (file)
--- a/src/vpn-manager/nm-vpn-service.h
+++ b/src/vpn-manager/nm-vpn-service.h
@@ -22,8 +22,7 @@
 #ifndef __NETWORKMANAGER_VPN_SERVICE_H__
 #define __NETWORKMANAGER_VPN_SERVICE_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-device.h"
 #include "nm-vpn-connection.h"