about summary refs log tree commit diff
path: root/src/main-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-01-20 16:27:43 +0100
committerMichael Biebl <biebl@debian.org>2016-01-20 16:27:43 +0100
commitcbb3b57b5b60dbf1eadb795c834ac511f5e1ba21 (patch)
treea97e7cf8b8903a2902c34f586661a13da2a9f2ea /src/main-utils.c
parent5ddbb9de1f57acaeb47a151404bcf5f8c9729276 (diff)
parent494f296a3baab08522617b24b1f126d8f9a17502 (diff)
Merge tag 'upstream/1.1.90' into experimental
Upstream version 1.1.90
Diffstat (limited to 'src/main-utils.c')
-rw-r--r--src/main-utils.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main-utils.c b/src/main-utils.c
index da327c40..7425d0bc 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -29,17 +29,12 @@
 #include <sys/stat.h>
 #include <locale.h>
 
-#include <glib.h>
-#include <glib/gi18n.h>
 #include <glib-unix.h>
 #include <gmodule.h>
 
-#include "nm-glib-compat.h"
-
-#include "gsystem-local-alloc.h"
+#include "nm-default.h"
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-logging.h"
 
 static gboolean
 sighup_handler (gpointer user_data)