From 01e8818cdc16585319b9f361116a200f5efa11f7 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 29 May 2013 09:48:26 +0300 Subject: [PATCH] core: Use a dedicated D-Bus error for rfkill power on failure --- src/adapter.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index adb2a173f..12509661a 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1833,11 +1833,18 @@ static void property_set_mode_complete(uint8_t status, uint16_t length, DBG("%s (0x%02x)", mgmt_errstr(status), status); if (status != MGMT_STATUS_SUCCESS) { + const char *dbus_err; + error("Failed to set mode: %s (0x%02x)", mgmt_errstr(status), status); - g_dbus_pending_property_error(data->id, - ERROR_INTERFACE ".Failed", - mgmt_errstr(status)); + + if (status == MGMT_STATUS_RFKILLED) + dbus_err = ERROR_INTERFACE ".Blocked"; + else + dbus_err = ERROR_INTERFACE ".Failed"; + + g_dbus_pending_property_error(data->id, dbus_err, + mgmt_errstr(status)); return; } -- 2.47.3