From d15257e063643a40e6ba2de0d1bcffac629cca96 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 29 Dec 2012 22:35:18 -0800 Subject: [PATCH] core: UUID list of device might be empty, but it always exists --- src/device.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/device.c b/src/device.c index a64691a8f..06258485f 100644 --- a/src/device.c +++ b/src/device.c @@ -820,17 +820,6 @@ static gboolean dev_property_get_uuids(const GDBusPropertyTable *property, return TRUE; } -static gboolean dev_property_exists_uuids(const GDBusPropertyTable *property, - void *data) -{ - struct btd_device *dev = data; - - if (dev->svc_resolved) - return dev->uuids ? TRUE : FALSE; - else - return dev->eir_uuids ? TRUE : FALSE; -} - static gboolean dev_property_get_modalias(const GDBusPropertyTable *property, DBusMessageIter *iter, void *data) { @@ -1554,8 +1543,7 @@ static const GDBusPropertyTable device_properties[] = { { "LegacyPairing", "b", dev_property_get_legacy }, { "RSSI", "n", dev_property_get_rssi, NULL, dev_property_exists_rssi }, { "Connected", "b", dev_property_get_connected }, - { "UUIDs", "as", dev_property_get_uuids, NULL, - dev_property_exists_uuids }, + { "UUIDs", "as", dev_property_get_uuids }, { "Modalias", "s", dev_property_get_modalias, NULL, dev_property_exists_modalias }, { "Adapter", "o", dev_property_get_adapter }, -- 2.47.3