Bug 784255 - [b2g-bluetooth] devicefound event does not come up correctly, r=qdot
authorEric Chou <echou@mozilla.com>
Tue, 21 Aug 2012 14:24:05 +0800
changeset 108370 f9a8fdb081936577a38d596b3514f1a78a0c17a0
parent 108369 b64118688939b90ec06addbfd0fbe69147f6066b
child 108379 688a80cdf39fc0c26b4558702800a6cc279ddea0
child 108383 613bc459e292c2eb84546512b01171ed63e7991d
push idunknown
push userunknown
push dateunknown
reviewersqdot
bugs784255
milestone17.0a1
Bug 784255 - [b2g-bluetooth] devicefound event does not come up correctly, r=qdot
dom/bluetooth/linux/BluetoothDBusService.cpp
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -72,42 +72,44 @@ typedef struct {
 } Properties;
 
 static Properties sDeviceProperties[] = {
   {"Address", DBUS_TYPE_STRING},
   {"Name", DBUS_TYPE_STRING},
   {"Icon", DBUS_TYPE_STRING},
   {"Class", DBUS_TYPE_UINT32},
   {"UUIDs", DBUS_TYPE_ARRAY},
-  {"Services", DBUS_TYPE_ARRAY},
   {"Paired", DBUS_TYPE_BOOLEAN},
   {"Connected", DBUS_TYPE_BOOLEAN},
   {"Trusted", DBUS_TYPE_BOOLEAN},
   {"Blocked", DBUS_TYPE_BOOLEAN},
   {"Alias", DBUS_TYPE_STRING},
   {"Nodes", DBUS_TYPE_ARRAY},
   {"Adapter", DBUS_TYPE_OBJECT_PATH},
   {"LegacyPairing", DBUS_TYPE_BOOLEAN},
   {"RSSI", DBUS_TYPE_INT16},
   {"TX", DBUS_TYPE_UINT32},
-  {"Broadcaster", DBUS_TYPE_BOOLEAN}
+  {"Type", DBUS_TYPE_STRING},
+  {"Broadcaster", DBUS_TYPE_BOOLEAN},
+  {"Services", DBUS_TYPE_ARRAY}
 };
 
 static Properties sAdapterProperties[] = {
   {"Address", DBUS_TYPE_STRING},
   {"Name", DBUS_TYPE_STRING},
   {"Class", DBUS_TYPE_UINT32},
   {"Powered", DBUS_TYPE_BOOLEAN},
   {"Discoverable", DBUS_TYPE_BOOLEAN},
   {"DiscoverableTimeout", DBUS_TYPE_UINT32},
   {"Pairable", DBUS_TYPE_BOOLEAN},
   {"PairableTimeout", DBUS_TYPE_UINT32},
   {"Discovering", DBUS_TYPE_BOOLEAN},
   {"Devices", DBUS_TYPE_ARRAY},
   {"UUIDs", DBUS_TYPE_ARRAY},
+  {"Type", DBUS_TYPE_STRING}
 };
 
 static Properties sManagerProperties[] = {
   {"Adapters", DBUS_TYPE_ARRAY},
 };
 
 static const char* sBluetoothDBusIfaces[] =
 {