colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Lubomir Rintel
2015-07-09 17:18:50 +02:00
parent e101167e55
commit f44ac46485
1 changed files with 6 additions and 3 deletions
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-core-internal.h"
#include "nm-bt-error.h"
#include "nm-bluez-common.h" #include "nm-bluez-common.h"
#include "nm-bluez-device.h" #include "nm-bluez-device.h"
#include "nm-logging.h" #include "nm-logging.h"
@@ -436,8 +437,6 @@ nm_bluez_device_disconnect (NMBluezDevice *self)
} else if (priv->bluez_version == 5) { } else if (priv->bluez_version == 5) {
#if WITH_BLUEZ5_DUN #if WITH_BLUEZ5_DUN
nm_bluez5_dun_cleanup (priv->b5_dun_context); nm_bluez5_dun_cleanup (priv->b5_dun_context);
#else
g_assert_not_reached ();
#endif #endif
priv->connected = FALSE; priv->connected = FALSE;
goto out; 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); 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); nm_bluez5_dun_connect (priv->b5_dun_context, bluez5_dun_connect_cb, simple);
#else #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 #endif
return; return;
} }