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/nm-object-private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libnm/nm-object-private.h') diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h index 0b13cbb6e7..f8fcee9986 100644 --- 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 +#include "nm-glib.h" #include "nm-object.h" typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer); -- cgit v1.2.1