diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-08-27 18:33:59 -0300 |
|---|---|---|
| committer | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2008-08-28 19:06:20 -0300 |
| commit | 8a68b5fe931db5a432f924b0de22ed3acee024ba (patch) | |
| tree | f84c372201cb988a40c707130b8cbf4e9e656fa0 /src/device.c | |
| parent | 506c95298346d318304aa7e2211dfba5dbe6e3e0 (diff) | |
Device.GetProperties() cleanup
Diffstat (limited to 'src/device.c')
| -rw-r--r-- | src/device.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/device.c b/src/device.c index 62471a15..3ba4aa92 100644 --- a/src/device.c +++ b/src/device.c @@ -145,15 +145,13 @@ static DBusMessage *get_properties(DBusConnection *conn, DBusMessageIter iter; DBusMessageIter dict; bdaddr_t src, dst; - char path[MAX_PATH_LENGTH], name[248]; - char *ppath, **uuids; - const char *ptr; + char name[248]; + char **uuids; + const char *ptr, *source; dbus_bool_t boolean; uint32_t class; int i; GSList *l; - uint16_t dev_id = adapter_get_dev_id(adapter); - const gchar *source = adapter_get_address(adapter); reply = dbus_message_new_method_return(msg); if (!reply) @@ -173,6 +171,8 @@ static DBusMessage *get_properties(DBusConnection *conn, /* Name */ ptr = NULL; memset(name, 0, sizeof(name)); + source = adapter_get_address(adapter); + if (read_device_name(source, device->address, name) == 0) { ptr = name; dbus_message_iter_append_dict_entry(&dict, "Name", @@ -225,10 +225,9 @@ static DBusMessage *get_properties(DBusConnection *conn, g_free(uuids); /* Adapter */ - snprintf(path, sizeof(path), "%s/hci%d", "/org/bluez", dev_id); - ppath = path; + ptr = adapter_get_path(adapter); dbus_message_iter_append_dict_entry(&dict, "Adapter", - DBUS_TYPE_OBJECT_PATH, &ppath); + DBUS_TYPE_OBJECT_PATH, &ptr); dbus_message_iter_close_container(&iter, &dict); |