comp-manager: Notify error when mot fails

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

diff --git a/src/companion-manager/src/comp_group.c b/src/companion-manager/src/comp_group.c
index db17375..709164d 100644 (file)
--- a/src/companion-manager/src/comp_group.c
+++ b/src/companion-manager/src/comp_group.c
@@ -302,6 +302,8 @@ comp_group_invite_info_t *comp_group_get_invite_info()
 
 void comp_group_free_invite_info()
 {
+       LOG_DEBUG("Remove Group Invite Information %p", group_invite_info);
+
        if (group_invite_info) {
                g_free(group_invite_info->uuid_dev1);
                g_free(group_invite_info->uuid_dev2);
@@ -356,6 +358,8 @@ int comp_group_invite(gchar *uuid_dev1, gchar *uuid_dev2, gchar *pin,
                group_invite_info->rt_2 = g_strdup(rt_2);
                group_invite_info->interface_2 = g_strdup(interface_2);
                group_invite_info->permission_2 = permission_2;
+
+               LOG_DEBUG("Group Invite Information created %p", group_invite_info);
        }
 
        LOG_END();

diff --git a/src/companion-manager/src/comp_mot_agent.c b/src/companion-manager/src/comp_mot_agent.c
index 064346d..7dfd5eb 100644 (file)
--- a/src/companion-manager/src/comp_mot_agent.c
+++ b/src/companion-manager/src/comp_mot_agent.c
@@ -381,24 +381,6 @@ static GDBusProxy *_get_proxy_service()
        return proxy;
 }
 
-static gboolean __perform_group_mot_dev2(gpointer data)
-{
-       int ret;
-
-       comp_group_invite_info_t *group_invite_info;
-
-       group_invite_info = comp_group_get_invite_info();
-
-       ret = agent_mot_device(group_invite_info->uuid_dev2,
-                                                  group_invite_info->pin);
-       if (ret != COMP_ERROR_NONE)
-               comp_group_notify_group_invite(ret);
-       else
-               mot_dev2 = true;
-
-       return FALSE;
-}
-
 static gboolean __perform_agent_pairwise(gpointer data)
 {
        int ret;
@@ -696,6 +678,13 @@ static void _agent_signal_handler(GDBusConnection *connection,
                comp_mot_device_t *device;
                comp_context_t *comp_ctx = comp_context_get_context();
 
+               g_variant_get(parameters, "(i)", &result);
+               LOG_DEBUG("Result : %d", result);
+
+               if (result != 0 && result != 49 &&
+                       (comp_group_get_invite_info() != NULL))
+                       comp_group_notify_group_invite(result);
+
                if (comp_ctx && (TRUE == comp_ctx->mot_me) ) {
                        g_timeout_add(10, __perform_agent_pairwise, NULL);
                }