From f4557256ea9d0912dbd292c5431c41a2073e2cdc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 2 Oct 2013 14:35:06 +0200 Subject: [PATCH] bluez: fix creation of NAP connection for bluez device Signed-off-by: Thomas Haller --- src/bluez-manager/nm-bluez-device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c index 4ba4d9b6f..664c846d9 100644 --- a/src/bluez-manager/nm-bluez-device.c +++ b/src/bluez-manager/nm-bluez-device.c @@ -98,6 +98,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static void cp_connection_added (NMConnectionProvider *provider, NMConnection *connection, NMBluezDevice *self); +static gboolean connection_compatible (NMBluezDevice *self, NMConnection *connection); /***********************************************************/ @@ -246,8 +247,10 @@ pan_connection_check_create (NMBluezDevice *self) g_signal_handlers_unblock_by_func (priv->provider, cp_connection_added, self); if (added) { - g_assert (g_slist_find (priv->connections, added)); + g_assert (!g_slist_find (priv->connections, added)); + g_assert (connection_compatible (self, added)); + priv->connections = g_slist_prepend (priv->connections, g_object_ref (added)); priv->pan_connection = added; nm_log_dbg (LOGD_SETTINGS, "added new Bluetooth connection for NAP device '%s': '%s' (%s)", priv->path, id, uuid); } else {