adapter: Fix error message for StopPollLoop

Now when adapter is not polling and StopPollLoop is called, correct error
message will be returned.

diff --git a/src/adapter.c b/src/adapter.c
index 892381c..e5f9e6a 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -424,6 +424,9 @@ static DBusMessage *stop_poll_loop(DBusConnection *conn,
 
        DBG("conn %p", conn);
 
+       if (adapter->polling == FALSE)
+               return __near_error_not_polling(msg);
+
        err = __near_netlink_stop_poll(adapter->idx);
        if (err < 0)
                return __near_error_failed(msg, -err);

diff --git a/src/error.c b/src/error.c
index f166380..4012b5b 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -119,6 +119,12 @@ DBusMessage *__near_error_not_found(DBusMessage *msg)
                                                ".NotFound", "Not found");
 }
 
+DBusMessage *__near_error_not_polling(DBusMessage *msg)
+{
+       return g_dbus_create_error(msg, NFC_ERROR_INTERFACE
+                                               ".Failed", "Not polling");
+}
+
 DBusMessage *__near_error_no_carrier(DBusMessage *msg)
 {
        return g_dbus_create_error(msg, NFC_ERROR_INTERFACE

diff --git a/src/near.h b/src/near.h
index c6debdd..aee34be 100644 (file)
--- a/src/near.h
+++ b/src/near.h
@@ -51,6 +51,7 @@ DBusMessage *__near_error_not_unique(DBusMessage *msg);
 DBusMessage *__near_error_not_supported(DBusMessage *msg);
 DBusMessage *__near_error_not_implemented(DBusMessage *msg);
 DBusMessage *__near_error_not_found(DBusMessage *msg);
+DBusMessage *__near_error_not_polling(DBusMessage *msg);
 DBusMessage *__near_error_no_carrier(DBusMessage *msg);
 DBusMessage *__near_error_in_progress(DBusMessage *msg);
 DBusMessage *__near_error_already_exists(DBusMessage *msg);