fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 19:30:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/bluez: delay check_emit_usable() for NM_CP_SIGNAL_CONNECTION_UPDATED

Browse source 
Currently, NM_CP_SIGNAL_CONNECTION_UPDATED signal will be invoked on an
idle handler. I want to change that, so to be save, delay actions that
matter on an idle handler.

(cherry picked from commit 640ef67cd7)
This commit is contained in:
Thomas Haller 2016-04-13 15:20:54 +02:00 • committed by Beniamino Galvani
parent 30590effc8
commit 887fc983be
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/devices/bluetooth/nm-bluez-device.c
View file

@ -54,6 +54,8 @@ typedef struct {
gboolean usable;
NMBluetoothCapabilities connection_bt_type;
guint check_emit_usable_id;
char *adapter_address;
char *address;
char *name;
@ -257,14 +259,14 @@ pan_connection_check_create (NMBluezDevice *self)
g_free (uuid);
}
static void
static gboolean
check_emit_usable (NMBluezDevice *self)
{
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
gboolean new_usable;
/* only expect the supported capabilities set. */
g_assert ((priv->capabilities & ~(NM_BT_CAPABILITY_NAP | NM_BT_CAPABILITY_DUN)) == NM_BT_CAPABILITY_NONE );
nm_assert ((priv->capabilities & ~(NM_BT_CAPABILITY_NAP | NM_BT_CAPABILITY_DUN)) == NM_BT_CAPABILITY_NONE );
new_usable = (priv->initialized && priv->capabilities && priv->name &&
((priv->bluez_version == 4) ||
@ -291,6 +293,17 @@ END:
priv->usable = new_usable;
g_object_notify (G_OBJECT (self), NM_BLUEZ_DEVICE_USABLE);
}
return G_SOURCE_REMOVE;
}
static void
check_emit_usable_schedule (NMBluezDevice *self)
{
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
if (priv->check_emit_usable_id == 0)
priv->check_emit_usable_id = g_idle_add ((GSourceFunc) check_emit_usable, self);
}
/********************************************************************/
@ -380,7 +393,7 @@ cp_connection_updated (NMConnectionProvider *provider,
{
if (_internal_track_connection (self, connection,
connection_compatible (self, connection)))
check_emit_usable (self);
check_emit_usable_schedule (self);
}
static void
@ -1085,6 +1098,8 @@ dispose (GObject *object)
NMBluezDevicePrivate *priv = NM_BLUEZ_DEVICE_GET_PRIVATE (self);
NMConnection *to_delete = NULL;
nm_clear_g_source (&priv->check_emit_usable_id);
if (priv->pan_connection) {
/* Check whether we want to remove the created connection. If so, we take a reference
* and delete it at the end of dispose(). */