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

bluetooth: avoid an assertion failure if built w/o bluez5 support

Browse source 
Fail with a proper error if we built without Bluez 5 support, but detect it at
runtime.

(cherry picked from commit f44ac46485)
This commit is contained in:
Lubomir Rintel 2015-07-09 17:18:50 +02:00
parent c73eeb39f5
commit 8455d42684
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,6 +28,7 @@
#include "nm-core-internal.h"
#include "nm-bt-error.h"
#include "nm-bluez-common.h"
#include "nm-bluez-device.h"
#include "nm-logging.h"
@ -436,8 +437,6 @@ nm_bluez_device_disconnect (NMBluezDevice *self)
} else if (priv->bluez_version == 5) {
#if WITH_BLUEZ5_DUN
nm_bluez5_dun_cleanup (priv->b5_dun_context);
#else
g_assert_not_reached ();
#endif
priv->connected = FALSE;
goto out;
@ -559,7 +558,11 @@ nm_bluez_device_connect_async (NMBluezDevice *self,
priv->b5_dun_context = nm_bluez5_dun_new (priv->adapter_address, priv->address);
nm_bluez5_dun_connect (priv->b5_dun_context, bluez5_dun_connect_cb, simple);
#else
g_assert_not_reached ();
g_simple_async_result_set_error (simple,
NM_BT_ERROR,
NM_BT_ERROR_DUN_CONNECT_FAILED,
"NetworkManager built without support for Bluez 5");
g_simple_async_result_complete (simple);
#endif
return;
}