From 965c65dbc94ab5236c0c152988b613f56432dda0 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 29 Jan 2013 17:32:30 -0600 Subject: [PATCH] core: Let device_set_auto_connect do connect list adding The device_set_auto_connect function should be the only function that needs to call adapter_connect_list_add(). --- src/device.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/device.c b/src/device.c index bc40bb43c..ee7fc545c 100644 --- a/src/device.c +++ b/src/device.c @@ -3508,9 +3508,6 @@ void device_set_auto_connect(struct btd_device *device, gboolean enable) return; } - if (device->attios == NULL && device->attios_offline == NULL) - return; - /* Enabling auto connect */ adapter_connect_list_add(device->adapter, device); } @@ -4116,6 +4113,8 @@ guint btd_device_add_attio_callback(struct btd_device *device, attio->dcfunc = dcfunc; attio->user_data = user_data; + device_set_auto_connect(device, TRUE); + if (device->attrib && cfunc) { device->attios_offline = g_slist_append(device->attios_offline, attio); @@ -4125,8 +4124,6 @@ guint btd_device_add_attio_callback(struct btd_device *device, device->attios = g_slist_append(device->attios, attio); - adapter_connect_list_add(device->adapter, device); - return attio->id; } -- 2.47.3