From eb2b8c2798bf50392b7cdd0ed203749742408bfa Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Fri, 15 May 2015 16:36:43 +0200
Subject: [PATCH] build: use compat version of g_clear_pointer()

Ubuntu 12.04 has an ancient version of glib, which we nevertheless support.
---
 libnm-core/nm-dbus-utils.c                     | 1 +
 src/main-utils.c                               | 2 ++
 src/nm-connectivity.c                          | 2 ++
 src/settings/plugins/keyfile/writer.c          | 2 ++
 src/supplicant-manager/nm-supplicant-manager.c | 2 ++
 5 files changed, 9 insertions(+)

diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index 1f1e20cedc..4bdbdd0942 100644
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -24,6 +24,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib-compat.h"
 #include "nm-core-internal.h"
 
 typedef struct {
diff --git a/src/main-utils.c b/src/main-utils.c
index 1d899587ec..5378ca97a1 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -34,6 +34,8 @@
 #include <glib-unix.h>
 #include <gmodule.h>
 
+#include "nm-glib-compat.h"
+
 #include "gsystem-local-alloc.h"
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index 1dfcf00b15..f7e7576c22 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -26,6 +26,8 @@
 #include <libsoup/soup.h>
 #endif
 
+#include "nm-glib-compat.h"
+
 #include "nm-connectivity.h"
 #include "nm-config.h"
 #include "nm-logging.h"
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index 9cf119c0c8..b6a8786dc4 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <string.h>
 
+#include "nm-glib-compat.h"
+
 #include "nm-logging.h"
 #include "writer.h"
 #include "common.h"
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index d07e23aeab..083f2ebcb7 100644
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -25,6 +25,8 @@
 #include <glib.h>
 #include <dbus/dbus.h>
 
+#include "nm-glib-compat.h"
+
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
 #include "nm-logging.h"