diff options
Diffstat (limited to 'src/modules/bluetooth/bluetooth-util.c')
-rw-r--r-- | src/modules/bluetooth/bluetooth-util.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/modules/bluetooth/bluetooth-util.c b/src/modules/bluetooth/bluetooth-util.c index 211b4ffa..3165ed8a 100644 --- a/src/modules/bluetooth/bluetooth-util.c +++ b/src/modules/bluetooth/bluetooth-util.c @@ -286,7 +286,6 @@ static pa_bluetooth_device* device_new(pa_bluetooth_discovery *discovery, const d->device_info_valid = 0; - d->name = NULL; d->path = pa_xstrdup(path); d->paired = -1; d->alias = NULL; @@ -335,7 +334,6 @@ static void device_free(pa_bluetooth_device *d) { uuid_free(u); } - pa_xfree(d->name); pa_xfree(d->path); pa_xfree(d->alias); pa_xfree(d->address); @@ -469,10 +467,7 @@ static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i, boo const char *value; dbus_message_iter_get_basic(&variant_i, &value); - if (pa_streq(key, "Name")) { - pa_xfree(d->name); - d->name = pa_xstrdup(value); - } else if (pa_streq(key, "Alias")) { + if (pa_streq(key, "Alias")) { pa_xfree(d->alias); d->alias = pa_xstrdup(value); } else if (pa_streq(key, "Address")) { @@ -1017,7 +1012,7 @@ static int parse_device_properties(pa_bluetooth_device *d, DBusMessageIter *i, b dbus_message_iter_next(&element_i); } - if (!d->name || !d->address || !d->alias || d->paired < 0 || d->trusted < 0) { + if (!d->address || !d->alias || d->paired < 0 || d->trusted < 0) { pa_log_error("Non-optional information missing for device %s", d->path); d->device_info_valid = -1; return -1; |