diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-12 21:20:25 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-12 21:20:25 +0200 |
| commit | fab3fc02f88cadf2766e1859802d9c5419d131bf (patch) | |
| tree | ea7acd7f18b5e0c7a19caeb2bfb120b78646612c | |
| parent | b78a95d022988751ce0b393eb742cd6aa01cb29f (diff) | |
Use cached adapter name instead of reading it from storage
| -rw-r--r-- | src/adapter.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/adapter.c b/src/adapter.c index 189b7a4b..c70a4a99 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1534,21 +1534,21 @@ static DBusMessage *get_properties(DBusConnection *conn, /* Address */ property = srcaddr; dbus_message_iter_append_dict_entry(&dict, "Address", - DBUS_TYPE_STRING, &property); + DBUS_TYPE_STRING, &property); /* Name */ memset(str, 0, sizeof(str)); + strncpy(str, (char *) adapter->dev.name, 248); property = str; - if (!read_local_name(&adapter->bdaddr, str)) - dbus_message_iter_append_dict_entry(&dict, "Name", - DBUS_TYPE_STRING, &property); + dbus_message_iter_append_dict_entry(&dict, "Name", + DBUS_TYPE_STRING, &property); /* Mode */ property = mode2str(adapter->mode); dbus_message_iter_append_dict_entry(&dict, "Mode", - DBUS_TYPE_STRING, &property); + DBUS_TYPE_STRING, &property); /* DiscoverableTimeout */ dbus_message_iter_append_dict_entry(&dict, "DiscoverableTimeout", @@ -1559,9 +1559,9 @@ static DBusMessage *get_properties(DBusConnection *conn, else discov_active = FALSE; - /* PeriodicDiscovery */ + /* Discovering */ dbus_message_iter_append_dict_entry(&dict, "Discovering", - DBUS_TYPE_BOOLEAN, &discov_active); + DBUS_TYPE_BOOLEAN, &discov_active); dbus_message_iter_close_container(&iter, &dict); |