diff options
Diffstat (limited to 'src/devices/bluetooth/nm-device-bt.c')
| -rw-r--r-- | src/devices/bluetooth/nm-device-bt.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c index e151b795..eef4ed0a 100644 --- a/src/devices/bluetooth/nm-device-bt.c +++ b/src/devices/bluetooth/nm-device-bt.c @@ -20,12 +20,13 @@ #include "nm-default.h" +#include "nm-device-bt.h" + #include <stdio.h> #include <string.h> #include "nm-bluez-common.h" #include "nm-bluez-device.h" -#include "nm-device-bt.h" #include "nm-device-private.h" #include "ppp-manager/nm-ppp-manager.h" #include "nm-setting-connection.h" @@ -39,6 +40,7 @@ #include "nm-utils.h" #include "nm-bt-error.h" #include "nm-bt-enum-types.h" +#include "nm-platform.h" #include "nmdbus-device-bt.h" @@ -315,7 +317,8 @@ complete_connection (NMDevice *device, return FALSE; } - nm_utils_complete_generic (connection, + nm_utils_complete_generic (NM_PLATFORM_GET, + connection, NM_SETTING_BLUETOOTH_SETTING_NAME, existing_connections, preferred, @@ -497,8 +500,8 @@ modem_ip4_config_result (NMModem *modem, if (error) { _LOGW (LOGD_MB | LOGD_IP4 | LOGD_BT, - "retrieving IP4 configuration failed: (%d) %s", - error->code, error->message ? error->message : "(unknown)"); + "retrieving IP4 configuration failed: %s", + error->message); nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE); } else @@ -728,8 +731,7 @@ bluez_connect_cb (GObject *object, res, &error); if (!device) { - _LOGW (LOGD_BT, "Error connecting with bluez: %s", - error && error->message ? error->message : "(unknown)"); + _LOGW (LOGD_BT, "Error connecting with bluez: %s", error->message); g_clear_error (&error); nm_device_state_changed (NM_DEVICE (self), |