From 3452ee2a0e3d04a324e7b9cd153323a353d5c182 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 6 Apr 2015 16:42:31 -0400 Subject: all: rename nm-glib-compat.h to nm-glib.h, use everywhere Rather than randomly including one or more of , , and everywhere (and forgetting to include "nm-glib-compat.h" most of the time), rename nm-glib-compat.h to nm-glib.h, include 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). --- libnm-util/nm-setting-ip4-config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libnm-util/nm-setting-ip4-config.c') diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 4db43cbca8..838a88e0d0 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -26,14 +26,13 @@ #include #include +#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 -- cgit v1.2.1