diff options
| -rw-r--r-- | network/connection.c | 8 | ||||
| -rw-r--r-- | serial/port.c | 2 | ||||
| -rw-r--r-- | src/device.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/network/connection.c b/network/connection.c index 37a7511b7..d24d96c1e 100644 --- a/network/connection.c +++ b/network/connection.c @@ -123,12 +123,6 @@ static inline DBusMessage *already_connected(DBusMessage *msg) "Device already connected"); } -static inline DBusMessage *not_connected(DBusMessage *msg) -{ - return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", - "Device not connected"); -} - static inline DBusMessage *not_permited(DBusMessage *msg) { return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed", @@ -460,7 +454,7 @@ static DBusMessage *connection_disconnect(DBusConnection *conn, return connection_cancel(conn, msg, nc); } - return not_connected(msg); + return btd_error_not_connected(msg); } static DBusMessage *connection_get_properties(DBusConnection *conn, diff --git a/serial/port.c b/serial/port.c index 1d0bfc18d..0d1e60054 100644 --- a/serial/port.c +++ b/serial/port.c @@ -533,7 +533,7 @@ static DBusMessage *port_disconnect(DBusConnection *conn, return btd_error_does_not_exist(msg); if (!port->listener_id) - return failed(msg, "Not connected"); + return btd_error_not_connected(msg); owner = dbus_message_get_sender(port->msg); caller = dbus_message_get_sender(msg); diff --git a/src/device.c b/src/device.c index cc8131bf4..91b9d23ef 100644 --- a/src/device.c +++ b/src/device.c @@ -799,9 +799,7 @@ static DBusMessage *disconnect(DBusConnection *conn, DBusMessage *msg, struct btd_device *device = user_data; if (!device->handle) - return g_dbus_create_error(msg, - ERROR_INTERFACE ".NotConnected", - "Device is not connected"); + return btd_error_not_connected(msg); device_request_disconnect(device, msg); |