diff options
| author | Dan Winship <danw@redhat.com> | 2015-04-06 16:42:31 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-07-24 13:25:47 -0400 |
| commit | 3452ee2a0e3d04a324e7b9cd153323a353d5c182 (patch) | |
| tree | f87c48e6b2d2777ee893f9d6aeabd95ee97bd8ca /libnm-glib/nm-object.c | |
| parent | dd0e19895532504e6de615d18a761457ec685b58 (diff) | |
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).
Diffstat (limited to 'libnm-glib/nm-object.c')
| -rw-r--r-- | libnm-glib/nm-object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c index 2cf7119e0d..206b3f5b4d 100644 --- 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" |