From: Saurav Babu Date: Thu, 18 Jan 2018 07:22:23 +0000 (+0530) Subject: CAPI: Disable comp-manager in companion-deinitialize() X-Git-Tag: submit/tizen/20190131.065036~190 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=722f97c8992c584cc71f03948efb3bd3ac1bd698;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git CAPI: Disable comp-manager in companion-deinitialize() Signed-off-by: Saurav Babu --- diff --git a/capi/src/companion.c b/capi/src/companion.c index 0682cec..41ed89b 100644 --- a/capi/src/companion.c +++ b/capi/src/companion.c @@ -13,8 +13,10 @@ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER; #define COMP_DBUS_SERVICE "org.tizen.companion" #define COMP_DBUS_GROUP_PATH "/org/tizen/companion/group" +#define COMP_DBUS_ENABLER_PATH "/org/tizen/companion/enabler" Group *group_proxy = NULL; +Enabler *enabler_proxy = NULL; int ref_count = 0; bool __is_initialized = false; @@ -238,20 +240,41 @@ static void _group_proxy_init(void) g_signal_connect(group_proxy, "send-data-finish", G_CALLBACK(__send_data_finish_cb), NULL); } +static void _enabler_proxy_init(void) +{ + GError *error = NULL; + + enabler_proxy = enabler_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, COMP_DBUS_SERVICE, + COMP_DBUS_ENABLER_PATH, NULL, &error); +} + static void _group_proxy_deinit(void) { group_proxy = NULL; } +static void _enabler_proxy_deinit(void) +{ + int ret; + + enabler_call_disable_sync(enabler_proxy, &ret, NULL, NULL); + enabler_proxy = NULL; +} + static int _gdbus_initialize(void) { int ret = 0; _group_proxy_init(); + _enabler_proxy_init(); if (group_proxy == NULL) ret = -1; /* LCOV_EXCL_LINE */ + if (enabler_proxy == NULL) + ret = -1; /* LCOV_EXCL_LINE */ + return ret; } @@ -260,6 +283,7 @@ static int _gdbus_deinitialize(void) int ret = 0; _group_proxy_deinit(); + _enabler_proxy_deinit(); return ret; }