summaryrefslogtreecommitdiffstats
path: root/hcid
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2006-03-14 13:47:56 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2006-03-14 13:47:56 +0000
commit0c0287befae94479dcdb61bacd5a21e0c5841bed (patch)
treea841ff15c847b36d7f06b3b46b176d71261bd4ac /hcid
parent2018d81d70ad9533bb54d54dbe0b3cc358a07a5a (diff)
fixed wrong checking of the remote name complete event status
Diffstat (limited to 'hcid')
-rw-r--r--hcid/dbus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hcid/dbus.c b/hcid/dbus.c
index b94c04cb..18ed1386 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -691,7 +691,6 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, i
name = textfile_get(filename, peer_addr);
if (name) {
-
dbus_message_append_args(signal_name,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID);
@@ -751,8 +750,9 @@ void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, char
/* remove from remote name request list */
if (dbus_connection_get_object_path_data(connection, path, (void *) &pdata))
remote_name_remove(&pdata->discovered_devices, peer);
-
- if (!status)
+
+ /* if the requested name failed, don't send signal and request the next name */
+ if (status)
goto request_next;