From 9c2c4e0591fc61e18685bb732ba79d6037acc9e5 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 27 Apr 2012 15:03:29 -0500
Subject: [PATCH] libnm-glib: fix build on older glib without g_clear_object()

---
 include/nm-glib-compat.h          | 2 +-
 libnm-glib/nm-access-point.c      | 2 ++
 libnm-glib/nm-device-bond.c       | 2 ++
 libnm-glib/nm-device-bt.c         | 2 ++
 libnm-glib/nm-device-ethernet.c   | 2 ++
 libnm-glib/nm-device-infiniband.c | 2 ++
 libnm-glib/nm-device-modem.c      | 2 ++
 libnm-glib/nm-device-olpc-mesh.c  | 2 ++
 libnm-glib/nm-device-vlan.c       | 2 ++
 libnm-glib/nm-device-wifi.c       | 2 ++
 libnm-glib/nm-device-wimax.c      | 2 ++
 libnm-glib/nm-secret-agent.c      | 5 ++++-
 libnm-glib/nm-wimax-nsp.c         | 2 ++
 13 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/include/nm-glib-compat.h b/include/nm-glib-compat.h
index e953f6ebcd..3b772f4f1d 100644
--- a/include/nm-glib-compat.h
+++ b/include/nm-glib-compat.h
@@ -45,7 +45,7 @@
 
 #define g_clear_object(object_ptr) \
 	G_STMT_START { \
-		GObject **__obj_p = object_ptr; \
+		GObject **__obj_p = (gpointer) (object_ptr); \
 		if (*__obj_p) { \
 			g_object_unref (*__obj_p); \
 			*__obj_p = NULL; \
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 9c11c04d98..fef65575c7 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index 07ec4e8ec5..d5e33e5032 100644
--- a/libnm-glib/nm-device-bond.c
+++ b/libnm-glib/nm-device-bond.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-bond.h>
 #include <nm-utils.h>
diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c
index b175f37d43..ccfa83ca72 100644
--- a/libnm-glib/nm-device-bt.c
+++ b/libnm-glib/nm-device-bt.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
 
diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index bc61b1fed7..e9d1b4ad0b 100644
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-pppoe.h>
diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
index 4dee29dafa..d611993be2 100644
--- a/libnm-glib/nm-device-infiniband.c
+++ b/libnm-glib/nm-device-infiniband.c
@@ -25,6 +25,8 @@
 #include <linux/if_infiniband.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-infiniband.h>
 #include <nm-utils.h>
diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c
index 40597bf3c9..f7a9230e04 100644
--- a/libnm-glib/nm-device-modem.c
+++ b/libnm-glib/nm-device-modem.c
@@ -24,6 +24,8 @@
 #include <config.h>
 #include <string.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c
index 9d14aa0b63..7ca36890f8 100644
--- a/libnm-glib/nm-device-olpc-mesh.c
+++ b/libnm-glib/nm-device-olpc-mesh.c
@@ -24,6 +24,8 @@
 #include <config.h>
 #include <string.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
 
diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c
index 6ff729276c..13ca3ac335 100644
--- a/libnm-glib/nm-device-vlan.c
+++ b/libnm-glib/nm-device-vlan.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-vlan.h>
 #include <nm-utils.h>
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index 01f0468c37..0058fd1048 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index de99b7c16c..62e3f77231 100644
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -25,6 +25,8 @@
 #include <string.h>
 #include <netinet/ether.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 02f7419b90..ae048d803e 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -21,9 +21,12 @@
 #include <config.h>
 #include <ctype.h>
 #include <string.h>
-#include <NetworkManager.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib-compat.h"
+
+#include <NetworkManager.h>
+
 #include "nm-secret-agent.h"
 #include "nm-glib-enum-types.h"
 #include "nm-glib-marshal.h"
diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
index 980f7ced5b..ce1048be70 100644
--- a/libnm-glib/nm-wimax-nsp.c
+++ b/libnm-glib/nm-wimax-nsp.c
@@ -23,6 +23,8 @@
 #include <config.h>
 #include <string.h>
 
+#include "nm-glib-compat.h"
+
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>