diff options
| author | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-07-01 14:54:17 -0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-07-28 10:31:18 -0300 |
| commit | 34f8a76bd5bd24ae1a1594f4d1460df393675ec1 (patch) | |
| tree | 0c65e1d8b2d34d978a1b470f661778aa0d110573 /hcid/dbus-hci.c | |
| parent | 1ea3f7de314eb0b699cac4b80f5085666c0e6d50 (diff) | |
Remove BASE_PATH define.
Diffstat (limited to 'hcid/dbus-hci.c')
| -rw-r--r-- | hcid/dbus-hci.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index c3c46193..be5ce703 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -1506,8 +1506,7 @@ void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status) if (!adapter->pdiscov_requestor) adapter->discov_type &= ~RESOLVE_NAME; - dbus_connection_emit_property_changed(connection, - adapter->path + ADAPTER_PATH_INDEX, + dbus_connection_emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "PeriodicDiscovery", DBUS_TYPE_BOOLEAN, &adapter->pdiscov_active); } @@ -1515,7 +1514,6 @@ void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status) void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) { struct adapter *adapter; - char *ptr; /* Don't send the signal if the cmd failed */ if (status) @@ -1527,8 +1525,6 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) return; } - ptr = adapter->path + ADAPTER_PATH_INDEX; - /* reset the discover type to be able to handle D-Bus and non D-Bus * requests */ adapter->pdiscov_active = 0; @@ -1554,7 +1550,7 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) /* workaround: inquiry completed is not sent when exiting from * periodic inquiry */ if (adapter->discov_active) { - g_dbus_emit_signal(connection, ptr, + g_dbus_emit_signal(connection, adapter->path, ADAPTER_INTERFACE, "DiscoveryCompleted", DBUS_TYPE_INVALID); @@ -1562,7 +1558,7 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) } /* Send discovery completed signal if there isn't name to resolve */ - dbus_connection_emit_property_changed(connection, ptr, + dbus_connection_emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "PeriodicDiscovery", DBUS_TYPE_BOOLEAN, &adapter->discov_active); } |