depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

context: Use g_signal_connect_object for removal handling

Browse source 
Technically the API user might not keep the FpContext around after getting
the device object. Really bad idea, but we shouldn't rely on that.
This commit is contained in:
Benjamin Berg 2021-04-22 16:37:18 +02:00
parent 11e379050f
commit 511d456006
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libfprint/fp-context.c
View file

@ -147,10 +147,17 @@ device_removed_cb (FpContext *context, FpDevice *device)
/* Wait for device close if the device is currently still open. */ /* Wait for device close if the device is currently still open. */
if (open) if (open)
g_signal_connect_swapped (device, "notify::open", (GCallback) device_remove_on_notify_open_cb, context); {
g_signal_connect_object (device, "notify::open",
(GCallback) device_remove_on_notify_open_cb,
context,
G_CONNECT_SWAPPED);
}
else else
{
remove_device (context, device); remove_device (context, device);
} }
}
static void static void
async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
@ -177,7 +184,10 @@ async_device_init_done_cb (GObject *source_object, GAsyncResult *res, gpointer u
g_ptr_array_add (priv->devices, device); g_ptr_array_add (priv->devices, device);
g_signal_connect_swapped (device, "removed", (GCallback) device_removed_cb, context); g_signal_connect_object (device, "removed",
(GCallback) device_removed_cb,
context,
G_CONNECT_SWAPPED);
g_signal_emit (context, signals[DEVICE_ADDED_SIGNAL], 0, device); g_signal_emit (context, signals[DEVICE_ADDED_SIGNAL], 0, device);
} }