From 3452ee2a0e3d04a324e7b9cd153323a353d5c182 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@redhat.com>
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 <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).
---
 src/nm-firewall-manager.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/nm-firewall-manager.c')

diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 9bffac7599..304ee7e932 100644
--- 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"
-- 
cgit v1.2.1