From 4be056f5046e4531baae51f381222759e4e461b8 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Date: Thu, 30 May 2013 10:56:59 +0200
Subject: [PATCH] bluez: listen to Connected changes through NMBluezDevice

---
 src/devices/nm-device-bt.c | 62 ++++++++++----------------------------
 1 file changed, 16 insertions(+), 46 deletions(-)

diff --git a/src/devices/nm-device-bt.c b/src/devices/nm-device-bt.c
index ae8707bf53..1350a6ebdc 100644
--- a/src/devices/nm-device-bt.c
+++ b/src/devices/nm-device-bt.c
@@ -69,10 +69,10 @@ typedef struct {
 	guint32 capabilities;
 
 	gboolean connected;
+	guint32 connected_id;
 	gboolean have_iface;
 
 	DBusGProxy *type_proxy;
-	DBusGProxy *dev_proxy;
 
 	char *rfcomm_iface;
 	NMModem *modem;
@@ -759,33 +759,17 @@ bluez_connect_cb (DBusGProxy *proxy,
 }
 
 static void
-bluez_property_changed (DBusGProxy *proxy,
-                        const char *property,
-                        GValue *value,
-                        gpointer user_data)
+bluez_connected_changed (NMBluezDevice *bt_device,
+                         GParamSpec *pspec,
+                         NMDevice *device)
 {
-	NMDevice *device = NM_DEVICE (user_data);
-	NMDeviceBt *self = NM_DEVICE_BT (user_data);
+	NMDeviceBt *self = NM_DEVICE_BT (device);
 	NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
 	gboolean connected;
 	NMDeviceState state;
-	const char *prop_str = "(unknown)";
-
-	if (G_VALUE_HOLDS_STRING (value))
-		prop_str = g_value_get_string (value);
-	else if (G_VALUE_HOLDS_BOOLEAN (value))
-		prop_str = g_value_get_boolean (value) ? "true" : "false";
-
-	nm_log_dbg (LOGD_BT, "(%s): bluez property '%s' changed to '%s'",
-	            nm_device_get_iface (device),
-	            property,
-	            prop_str);
-
-	if (strcmp (property, "Connected"))
-		return;
 
 	state = nm_device_get_state (device);
-	connected = g_value_get_boolean (value);
+	connected = nm_bluez_device_get_connected (bt_device);
 	if (connected) {
 		if (state == NM_DEVICE_STATE_CONFIG) {
 			nm_log_dbg (LOGD_BT, "(%s): connected to the device",
@@ -861,24 +845,6 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
 		g_assert_not_reached ();
 
 	bus = nm_dbus_manager_get_connection (priv->dbus_mgr);
-	priv->dev_proxy = dbus_g_proxy_new_for_name (bus,
-	                                             BLUEZ_SERVICE,
-	                                             nm_device_get_udi (device),
-	                                             BLUEZ_DEVICE_INTERFACE);
-	if (!priv->dev_proxy) {
-		// FIXME: set a reason code
-		return NM_ACT_STAGE_RETURN_FAILURE;
-	}
-
-	/* Watch for BT device property changes */
-	dbus_g_object_register_marshaller (g_cclosure_marshal_generic,
-	                                   G_TYPE_NONE,
-	                                   G_TYPE_STRING, G_TYPE_VALUE,
-	                                   G_TYPE_INVALID);
-	dbus_g_proxy_add_signal (priv->dev_proxy, "PropertyChanged",
-	                         G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal (priv->dev_proxy, "PropertyChanged",
-	                             G_CALLBACK (bluez_property_changed), device, NULL);
 
 	priv->type_proxy = dbus_g_proxy_new_for_name (bus,
 	                                              BLUEZ_SERVICE,
@@ -991,11 +957,6 @@ deactivate (NMDevice *device)
 		}
 	}
 
-	if (priv->dev_proxy) {
-		g_object_unref (priv->dev_proxy);
-		priv->dev_proxy = NULL;
-	}
-
 	if (priv->timeout_id) {
 		g_source_remove (priv->timeout_id);
 		priv->timeout_id = 0;
@@ -1175,6 +1136,11 @@ constructed (GObject *object)
 	g_assert (my_hwaddr);
 	g_assert_cmpint (my_hwaddr_len, ==, ETH_ALEN);
 	priv->bdaddr = nm_utils_hwaddr_ntoa (my_hwaddr, ARPHRD_ETHER);
+
+	/* Watch for BT device property changes */
+	priv->connected_id = g_signal_connect (priv->bt_device, "notify::connected",
+					       G_CALLBACK (bluez_connected_changed),
+					       object);
 }
 
 static void
@@ -1234,6 +1200,11 @@ dispose (GObject *object)
 		priv->timeout_id = 0;
 	}
 
+	if (priv->connected_id) {
+		g_source_remove (priv->connected_id);
+		priv->connected_id = 0;
+	}
+
 	if (priv->dbus_mgr && priv->mm_watch_id) {
 		g_signal_handler_disconnect (priv->dbus_mgr, priv->mm_watch_id);
 		priv->mm_watch_id = 0;
@@ -1241,7 +1212,6 @@ dispose (GObject *object)
 	priv->dbus_mgr = NULL;
 
 	g_clear_object (&priv->type_proxy);
-	g_clear_object (&priv->dev_proxy);
 	g_clear_object (&priv->modem);
 	g_clear_object (&priv->bt_device);