diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-04 13:02:40 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-04 13:02:40 +0200 |
| commit | 694f069a0ddb5334293e8fadeb87b2009e036587 (patch) | |
| tree | 303a56792bc8596bdf1dba936347de0ccab8490a /plugins/neard.c | |
| parent | 69eb25af0f6be27f59dd234fd97c21a5db9ea900 (diff) | |
| download | bluez-694f069a0ddb5334293e8fadeb87b2009e036587.tar.gz | |
core: Remove unnecessary btd_event_remote_name function
Diffstat (limited to 'plugins/neard.c')
| -rw-r--r-- | plugins/neard.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/neard.c b/plugins/neard.c index ed7a2b91b..114d59c43 100644 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -312,9 +312,11 @@ static int process_eir(struct btd_adapter *adapter, uint8_t *eir, size_t size, device_set_class(device, eir_data.class); /* TODO handle incomplete name? */ - if (eir_data.name) - btd_event_remote_name(adapter_get_address(adapter), + if (eir_data.name) { + adapter_store_cached_name(adapter_get_address(adapter), &eir_data.addr, eir_data.name); + device_set_name(device, eir_data.name); + } if (eir_data.hash) btd_adapter_add_remote_oob_data(adapter, &eir_data.addr, @@ -507,8 +509,9 @@ static int process_nokia_com_bt(struct btd_adapter *adapter, void *data, DBG("hci%u remote:%s", adapter_get_dev_id(adapter), remote_address); if (nokia.name) { - btd_event_remote_name(adapter_get_address(adapter), remote, + adapter_store_cached_name(adapter_get_address(adapter), remote, nokia.name); + device_set_name(device, nokia.name); g_free(nokia.name); } |