From bbd2cc84efa4fc458e1b6c8d9d2d63940534f351 Mon Sep 17 00:00:00 2001 From: Saurav Babu Date: Thu, 11 Jan 2018 18:42:56 +0530 Subject: [PATCH] fn-manager: Notify device eject result Signed-off-by: Saurav Babu --- src/fn-manager/include/fn_gdbus_group.h | 1 + src/fn-manager/include/fn_group.h | 4 +++- src/fn-manager/src/comp_mot_agent.c | 2 ++ src/fn-manager/src/familynet_gdbus.xml | 3 +++ src/fn-manager/src/fn_gdbus_group.c | 5 +++++ src/fn-manager/src/fn_group.c | 7 +++++++ 6 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/fn-manager/include/fn_gdbus_group.h b/src/fn-manager/include/fn_gdbus_group.h index d1896b7..3c462e1 100755 --- a/src/fn-manager/include/fn_gdbus_group.h +++ b/src/fn-manager/include/fn_gdbus_group.h @@ -35,5 +35,6 @@ gboolean group_device_eject(Group *group, GDBusMethodInvocation *invocation, void notify_group_found(GVariant *group_data); void notify_group_finish(int ret); void notify_group_device_invite_result(int ret); +void notify_group_device_eject_result(int ret); #endif diff --git a/src/fn-manager/include/fn_group.h b/src/fn-manager/include/fn_group.h index 661bec6..d7d13e5 100755 --- a/src/fn-manager/include/fn_group.h +++ b/src/fn-manager/include/fn_group.h @@ -35,7 +35,9 @@ char *fn_group_invite_get_pin(); int fn_group_invite(gchar *uuid, gchar *pin); void fn_group_notify_group_invite(int result); -int fn_group_dismiss(/* callback */); //dismiss from group (async) +//dismiss from group (async) +int fn_group_dismiss(gchar *uuid); +void fn_group_notify_group_dismiss(int result); /* Join to remote device group */ int fn_group_get_remote_groups(/* callback */); //Get all of group in network (Async) diff --git a/src/fn-manager/src/comp_mot_agent.c b/src/fn-manager/src/comp_mot_agent.c index 428c503..a94ddc6 100644 --- a/src/fn-manager/src/comp_mot_agent.c +++ b/src/fn-manager/src/comp_mot_agent.c @@ -528,6 +528,8 @@ static void _agent_signal_handler(GDBusConnection *connection, } else if (0 == g_strcmp0(signal_name, "remove_mo_done")) { g_variant_get(parameters, "(i)", &result); LOG_DEBUG("Result : %d", result); + + fn_group_notify_group_dismiss(result); } else if (0 == g_strcmp0(signal_name, "pairwise_done")) { g_variant_get(parameters, "(i)", &result); LOG_DEBUG("Result : %d", result); diff --git a/src/fn-manager/src/familynet_gdbus.xml b/src/fn-manager/src/familynet_gdbus.xml index 08ab466..5b2d35b 100755 --- a/src/fn-manager/src/familynet_gdbus.xml +++ b/src/fn-manager/src/familynet_gdbus.xml @@ -59,5 +59,8 @@ + + + diff --git a/src/fn-manager/src/fn_gdbus_group.c b/src/fn-manager/src/fn_gdbus_group.c index 74aa89a..e1fe002 100755 --- a/src/fn-manager/src/fn_gdbus_group.c +++ b/src/fn-manager/src/fn_gdbus_group.c @@ -118,3 +118,8 @@ void notify_group_device_invite_result(int ret) { group_emit_device_invite_result(group_dbus_get_object(), ret); } + +void notify_group_device_eject_result(int ret) +{ + group_emit_device_eject_result(group_dbus_get_object(), ret); +} diff --git a/src/fn-manager/src/fn_group.c b/src/fn-manager/src/fn_group.c index 8f03c19..9603a27 100755 --- a/src/fn-manager/src/fn_group.c +++ b/src/fn-manager/src/fn_group.c @@ -215,6 +215,13 @@ int fn_group_invite(gchar *uuid, gchar *pin) return ret; } +void fn_group_notify_group_dismiss(int result) +{ + LOG_DEBUG("Notify group eject %d", result); + + notify_group_device_eject_result(result); +} + //dismiss from group (async) int fn_group_dismiss(gchar *uuid) { -- 2.7.4