colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
Dan Winship
2015-04-06 16:42:31 -04:00
parent dd0e198955
commit 3452ee2a0e
370 changed files with 374 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nm-active-connection.c
View File

@@ -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)