summaryrefslogtreecommitdiff
path: root/src/devices/nm-device-ethernet-utils.c
diff options
context:
space:
mode:
authorDan Winship <danw@redhat.com>2015-04-06 16:42:31 -0400
committerDan Winship <danw@redhat.com>2015-07-24 13:25:47 -0400
commit3452ee2a0e3d04a324e7b9cd153323a353d5c182 (patch)
treef87c48e6b2d2777ee893f9d6aeabd95ee97bd8ca /src/devices/nm-device-ethernet-utils.c
parentdd0e19895532504e6de615d18a761457ec685b58 (diff)
downloadNetworkManager-3452ee2a0e3d04a324e7b9cd153323a353d5c182.tar.gz
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 'src/devices/nm-device-ethernet-utils.c')
-rw-r--r--src/devices/nm-device-ethernet-utils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c
index 585f6a0e0e..7c226f065e 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -19,10 +19,10 @@
#include "config.h"
#include <string.h>
-#include <glib.h>
#include <glib/gi18n.h>
#include <nm-connection.h>
+#include "nm-glib.h"
#include "nm-device-ethernet-utils.h"
char *