Hi Frédéric,
On Wed, Oct 24, 2012, Frédéric Danis wrote:
> ---
> profiles/input/device.c | 26 ++++++++++++++++++++++----
> 1 file changed, 22 insertions(+), 4 deletions(-)
>
> diff --git a/profiles/input/device.c b/profiles/input/device.c
> index 9dd8002..41b7a5c 100644
> --- a/profiles/input/device.c
> +++ b/profiles/input/device.c
> @@ -37,6 +37,7 @@
> #include <bluetooth/sdp_lib.h>
> #include <bluetooth/uuid.h>
>
> +#include <glib.h>
> #include <gdbus.h>
>
> #include "log.h"
> @@ -757,7 +758,9 @@ static struct input_device *input_device_new(struct btd_device *device,
> {
> struct btd_adapter *adapter = device_get_adapter(device);
> struct input_device *idev;
> - char name[249], src_addr[18], dst_addr[18];
> + char src_addr[18], dst_addr[18];
> + char filename[PATH_MAX + 1];
> + GKeyFile *key_file;
>
> idev = g_new0(struct input_device, 1);
> bacpy(&idev->src, adapter_get_address(adapter));
> @@ -770,9 +773,24 @@ static struct input_device *input_device_new(struct btd_device *device,
> ba2str(&idev->src, src_addr);
> ba2str(&idev->dst, dst_addr);
>
> - if (read_device_name(src_addr, dst_addr, device_get_addr_type(device),
> - name) == 0)
> - idev->name = g_strdup(name);
> + snprintf(filename, PATH_MAX, STORAGEDIR "/%s/cache/%s", src_addr,
> + dst_addr);
> + filename[PATH_MAX] = '\0';
> + key_file = g_key_file_new();
> +
> + if (g_key_file_load_from_file(key_file, filename, 0, NULL)) {
> + int len;
> +
> + idev->name = g_key_file_get_string(key_file, "General",
> + "Name", NULL);
> + if (idev->name) {
> + len = strlen(idev->name);
> + if (len > HCI_MAX_NAME_LENGTH)
> + idev->name[HCI_MAX_NAME_LENGTH] = '\0';
> + }
> + }
> +
> + g_key_file_free(key_file);
>
> if (g_dbus_register_interface(btd_get_dbus_connection(),
> idev->path, INPUT_DEVICE_INTERFACE,
Same thing here with accessing core-daemon keyfiles directly. Just use
the btd_device_get_name function.
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
