diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 22:14:31 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-04 22:14:31 +0200 |
| commit | 93fbf4400a81f68cd3642084bd6d2aa51a173250 (patch) | |
| tree | 1e19f139bcc7bab9a9661a8c13c8cc7cb287ba61 | |
| parent | 395be16f30cd10001707c6a1ce593308029cc4cc (diff) | |
For adapters and devices use /org/bluez object path prefix
| -rw-r--r-- | src/adapter.c | 2 | ||||
| -rw-r--r-- | src/device.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/adapter.c b/src/adapter.c index a31b47f2..efc66c2e 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2562,7 +2562,7 @@ struct adapter *adapter_create(DBusConnection *conn, int id) if (!connection) connection = conn; - snprintf(path, sizeof(path), "/hci%d", id); + snprintf(path, sizeof(path), "%s/hci%d", "/org/bluez", id); adapter = g_try_new0(struct adapter, 1); if (!adapter) { diff --git a/src/device.c b/src/device.c index 99bfdd4c..4ef90803 100644 --- a/src/device.c +++ b/src/device.c @@ -247,7 +247,7 @@ static DBusMessage *get_properties(DBusConnection *conn, g_free(uuids); /* Adapter */ - snprintf(path, sizeof(path), "/hci%d", dev_id); + snprintf(path, sizeof(path), "%s/hci%d", "/org/bluez", dev_id); ppath = path; dbus_message_iter_append_dict_entry(&dict, "Adapter", DBUS_TYPE_OBJECT_PATH, &ppath); @@ -544,8 +544,8 @@ struct btd_device *device_create(DBusConnection *conn, struct adapter *adapter, return NULL; address_up = g_ascii_strup(address, -1); - device->path = g_strdup_printf("/hci%d/dev_%s", - dev_id, address_up); + device->path = g_strdup_printf("%s/hci%d/dev_%s", "/org/bluez", + dev_id, address_up); g_strdelimit(device->path, ":", '_'); g_free(address_up); |