Re: [PATCH 07/13] dundee: Listen to devices property changes

[Daniel Wagner <wagi@monom.org>]

[-- Attachment #1: Type: text/plain, Size: 1790 bytes --]

Hi Paulo,

On 03/04/2013 08:33 PM, Paulo Borges wrote:
> When a bluetooth device property change and this property is Alias
> or UUIDs, we need to refresh our representation of this device.
> ---
>   dundee/bluez5.c |   26 +++++++++++++++++++++++++-
>   1 file changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/dundee/bluez5.c b/dundee/bluez5.c
> index 8d8e656..623201f 100644
> --- a/dundee/bluez5.c
> +++ b/dundee/bluez5.c
> @@ -169,11 +169,35 @@ static void property_changed(GDBusProxy *proxy, const char *name,
>   {
>   	const char *path = g_dbus_proxy_get_path(proxy);
>   	const char *interface = g_dbus_proxy_get_interface(proxy);
> +	const char *alias;
> +	struct bluetooth_device *bt_device;
> +	gboolean uuid;
>
>   	if (g_str_equal(BLUEZ_DEVICE_INTERFACE, interface) == FALSE)
>   		return;
>
> -	DBG("%s %s.%s", path, interface, name);
> +	bt_device = g_hash_table_lookup(registered_devices, path);
> +
> +	if (g_str_equal(name, "Alias") == TRUE) {
> +		if (bt_device == NULL)
> +			return;
> +
> +		dbus_message_iter_get_basic(iter, &alias);
> +
> +		DBG("%s alias changed: %s", path, alias);
> +
> +		bt_device->name = g_strdup(alias);
> +	} else if (g_str_equal(name, "UUIDs") == TRUE) {
> +		DBG("%s uuids changed", path);
> +
> +		uuid = has_dun_uuid(iter);
> +
> +		if (bt_device != NULL && uuid == FALSE)
> +			bluetooth_device_unregister(path);
> +
> +		else if (bt_device == NULL && uuid == TRUE)
> +			bluetooth_device_register(proxy);
> +	}

I find this a bit hard to read. What about

	if (uuid)
		if (bt_device != NULL)
			bluetooth_device_unregister(path);
	else
		if (bt_device == NULL)
			bluetooth_device_regster(path);

? I am not sure if Denis or Marcel approves this :)

cheers,
daniel