diff options
| author | Thomas Haller <thaller@redhat.com> | 2013-10-02 14:35:06 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2013-10-02 20:21:44 +0200 |
| commit | f4557256ea9d0912dbd292c5431c41a2073e2cdc (patch) | |
| tree | f5df06ba0f2fbff8e08bd0e036344406eec99bc7 | |
| parent | e08687e1e2d9cb84b47398c68ff971dd063fa7ed (diff) | |
| download | NetworkManager-f4557256ea9d0912dbd292c5431c41a2073e2cdc.tar.gz | |
bluez: fix creation of NAP connection for bluez device
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/bluez-manager/nm-bluez-device.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bluez-manager/nm-bluez-device.c b/src/bluez-manager/nm-bluez-device.c index 4ba4d9b6f5..664c846d97 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 { |