From 4d586832765bb63bf680eebb682b4f78ce9fe642 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 13 May 2009 22:54:13 -0400
Subject: [PATCH] bluetooth: various fixes

Make stuff actually work this time around.
---
 src/bluez-manager/nm-bluez-adapter.c |  2 --
 src/bluez-manager/nm-bluez-common.h  |  4 +--
 src/bluez-manager/nm-bluez-device.c  | 47 +++++++++++++++-------------
 src/nm-manager.c                     |  6 ++--
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/bluez-manager/nm-bluez-adapter.c b/src/bluez-manager/nm-bluez-adapter.c
index 903dfc3ee8..ba8f7114f2 100644
--- a/src/bluez-manager/nm-bluez-adapter.c
+++ b/src/bluez-manager/nm-bluez-adapter.c
@@ -129,8 +129,6 @@ device_initialized (NMBluezDevice *device, gboolean success, gpointer user_data)
 
 	if (!success)
 		g_hash_table_remove (priv->devices, nm_bluez_device_get_path (device));
-	else
-		device_usable (device, NULL, self);
 }
 
 static void
diff --git a/src/bluez-manager/nm-bluez-common.h b/src/bluez-manager/nm-bluez-common.h
index b908f47858..4624c27a49 100644
--- a/src/bluez-manager/nm-bluez-common.h
+++ b/src/bluez-manager/nm-bluez-common.h
@@ -22,8 +22,8 @@
 #define NM_BLUEZ_COMMON_H
 
 enum {
-	NM_BLUEZ_TYPE_DUN  = 1 << 1,
-	NM_BLUEZ_TYPE_PANU = 1 << 2,
+	NM_BLUEZ_TYPE_DUN = 1 << 1,
+	NM_BLUEZ_TYPE_NAP = 1 << 2,
 };
 
 #define BLUEZ_SERVICE	"org.bluez"
diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c
index e209504ad6..d2f945351d 100644
--- a/src/bluez-manager/nm-bluez-device.c
+++ b/src/bluez-manager/nm-bluez-device.c
@@ -40,7 +40,6 @@ typedef struct {
 	gboolean initialized;
 	gboolean usable;
 
-	gboolean paired;
 	guint32 class;
 
 	char *address;
@@ -57,7 +56,6 @@ enum {
 	PROP_NAME,
 	PROP_UUIDS,
 	PROP_RSSI,
-	PROP_PAIRED,
 	PROP_USABLE,
 
 	LAST_PROP
@@ -152,10 +150,28 @@ convert_uuids (const char **strings)
 	guint32 uuids = 0;
 
 	for (iter = strings; iter && *iter; iter++) {
-		if (!strcmp (*iter, "DialupNetworking"))
+		char **parts;
+		guint uuid16;
+
+		parts = g_strsplit (*iter, "-", -1);
+		if (parts == NULL || parts[0] == NULL) {
+			g_strfreev (parts);
+			continue;
+		}
+
+		uuid16 = g_ascii_strtoull (parts[0], NULL, 16);
+		g_strfreev (parts);
+
+		switch (uuid16) {
+		case 0x1103:
 			uuids |= NM_BLUEZ_TYPE_DUN;
-		else if (!strcmp (*iter, "PANU"))
-			uuids |= NM_BLUEZ_TYPE_PANU;
+			break;
+		case 0x1116:
+			uuids |= NM_BLUEZ_TYPE_NAP;
+			break;
+		default:
+			break;
+		}
 	}
 
 	return uuids;
@@ -169,7 +185,6 @@ check_emit_usable (NMBluezDevice *self)
 	if (   priv->initialized
 	    && priv->uuids
 	    && is_phone_or_modem (priv->class)
-	    && priv->paired
 	    && priv->name
 	    && priv->address) {
 		if (!priv->usable) {
@@ -195,7 +210,6 @@ property_changed (DBusGProxy *proxy,
 	const char *str;
 	guint32 uint_val;
 	gint int_val;
-	gboolean bool_val;
 
 	if (!strcmp (property, "Name")) {
 		str = g_value_get_string (value);
@@ -205,14 +219,11 @@ property_changed (DBusGProxy *proxy,
 			g_free (priv->name);
 			priv->name = str ? g_strdup (str) : NULL;
 			g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_NAME);
-			check_emit_usable (self);
 		}
 	} else if (!strcmp (property, "Class")) {
 		uint_val = g_value_get_uint (value);
-		if (priv->class != uint_val) {
+		if (priv->class != uint_val)
 			priv->class = uint_val;
-			check_emit_usable (self);
-		}
 	} else if (!strcmp (property, "RSSI")) {
 		int_val = g_value_get_int (value);
 		if (priv->rssi != int_val) {
@@ -224,15 +235,10 @@ property_changed (DBusGProxy *proxy,
 		if (priv->uuids != uint_val) {
 			priv->uuids = uint_val;
 			g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_UUIDS);
-			check_emit_usable (self);
-		}
-	} else if (!strcmp (property, "Paired")) {
-		bool_val = g_value_get_boolean (value);
-		if (priv->paired != bool_val) {
-			priv->paired = bool_val;
-			check_emit_usable (self);
 		}
 	}
+
+	check_emit_usable (self);
 }
 
 static void
@@ -247,7 +253,7 @@ get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
 	if (!dbus_g_proxy_end_call (proxy, call, &err,
 	                            DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
 	                            G_TYPE_INVALID)) {
-		nm_warning ("bluez error getting adapter properties: %s",
+		nm_warning ("bluez error getting device properties: %s",
 		            err && err->message ? err->message : "(unknown)");
 		g_error_free (err);
 		g_signal_emit (self, signals[INITIALIZED], 0, FALSE);
@@ -371,9 +377,6 @@ get_property (GObject *object, guint prop_id,
 	case PROP_RSSI:
 		g_value_set_int (value, priv->rssi);
 		break;
-	case PROP_PAIRED:
-		g_value_set_boolean (value, priv->paired);
-		break;
 	case PROP_USABLE:
 		g_value_set_boolean (value, priv->usable);
 		break;
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 7c5b08ee69..9c805d5a16 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1803,14 +1803,14 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
 			       gpointer user_data)
 {
 	gboolean has_dun = (uuids & NM_BLUEZ_TYPE_DUN);
-	gboolean has_pan = (uuids & NM_BLUEZ_TYPE_PANU);
+	gboolean has_nap = (uuids & NM_BLUEZ_TYPE_NAP);
 
 	g_message ("%s: BT device %s added (%s%s%s)",
 	           __func__,
 	           bdaddr,
 	           has_dun ? "DUN" : "",
-	           has_dun ? " " : "",
-	           has_pan ? "PANU" : "");
+	           has_dun && has_nap ? " " : "",
+	           has_nap ? "NAP" : "");
 }
 
 static void