capi: Add requester device id in companion_request_result_cb

Signed-off-by: Saurav Babu <saurav.babu@samsung.com>

diff --git a/capi/include/companion.h b/capi/include/companion.h
index 638af2e..8ae17f6 100644 (file)
--- a/capi/include/companion.h
+++ b/capi/include/companion.h
@@ -500,6 +500,7 @@ int companion_group_eject_device(companion_h handle, companion_group_h group,
  * @remarks The @a cmd, @arg can be used only in the callback. To use outside, make a copy.
  *
  * @param[out] cmd Command
+ * @param[out] device_id Device id of requester
  * @param[out] arg Argument
  * @param[out] ret Return code
  * @param[out] user_data User data pointer
@@ -508,8 +509,8 @@ int companion_group_eject_device(companion_h handle, companion_group_h group,
  *
  * @see companion_request_result_callback()
  */
-typedef void (*companion_request_result_cb)(char *cmd, char *arg, int ret,
-               void *user_data);
+typedef void (*companion_request_result_cb)(char *cmd, char *device_id,
+                                       char *arg, int ret, void *user_data);
 
 /**
  * @brief Requests my device to be joined to remote group.

diff --git a/capi/src/companion_dbus.c b/capi/src/companion_dbus.c
index 0b0907a..520792a 100644 (file)
--- a/capi/src/companion_dbus.c
+++ b/capi/src/companion_dbus.c
@@ -240,8 +240,8 @@ static void __send_data_finish_cb(Group *object, gchar *resp_data, gint ret,
                        handle->send_data_finish_cb.user_data);
 }
 
-static void __request_result_cb(Group *object, gchar *cmd, gchar *arg, gint ret,
-       gpointer user_data)
+static void __request_result_cb(Group *object, gchar *cmd, gchar *device_id,
+                                       gchar *arg, gint ret, gpointer user_data)
 {
        NOTUSED(object);
 
@@ -249,7 +249,7 @@ static void __request_result_cb(Group *object, gchar *cmd, gchar *arg, gint ret,
        companion_check_null_ret("user_data", user_data);
 
        if (handle->request_result_cb.result_cb)
-               handle->request_result_cb.result_cb(cmd, arg, ret,
+               handle->request_result_cb.result_cb(cmd, device_id, arg, ret,
                        handle->request_result_cb.user_data);
 }
 /* LCOV_EXCL_STOP */

diff --git a/capi/src/companion_gdbus.xml b/capi/src/companion_gdbus.xml
index f4ebd9a..8eca1c4 100644 (file)
--- a/capi/src/companion_gdbus.xml
+++ b/capi/src/companion_gdbus.xml
@@ -175,6 +175,7 @@
                </signal>
                <signal name="RequestResult">
                        <arg type="s" name="command" direction="out" />
+                       <arg type="s" name="device_id" direction="out" />
                        <arg type="s" name="arg" direction="out" />
                        <arg type="i" name="result" direction="out" />
                </signal>