From 635b92accf5c49ce025c33eaa100f83c834a1720 Mon Sep 17 00:00:00 2001 From: Gukhwan Cho Date: Mon, 3 Aug 2015 21:16:24 +0900 Subject: [PATCH] apply pims-ipc modification(move disconnected cb to main thread) Change-Id: Ic791ac3698f4c1a05ee2abe0e2fccb7568d34140 Signed-off-by: Gukhwan Cho --- client/ctsvc_client_ipc.c | 7 +++++++ client/ctsvc_client_noti.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/ctsvc_client_ipc.c b/client/ctsvc_client_ipc.c index b7c424d..a971e96 100644 --- a/client/ctsvc_client_ipc.c +++ b/client/ctsvc_client_ipc.c @@ -154,6 +154,11 @@ static int _ctsvc_ipc_connect(contacts_h contact, pims_ipc_h ipc) return ret; } +static void _ctsvc_ipc_disconnected_cb(void *user_data) +{ + ctsvc_ipc_set_disconnected(true); +} + int ctsvc_ipc_connect(contacts_h contact, unsigned int handle_id) { int ret = CONTACTS_ERROR_NONE; @@ -180,6 +185,7 @@ int ctsvc_ipc_connect(contacts_h contact, unsigned int handle_id) return ret; } g_hash_table_insert(_ctsvc_ipc_table, strdup(ipc_key), ipc_data); + ctsvc_ipc_set_disconnected_cb(ipc_data->ipc, _ctsvc_ipc_disconnected_cb, NULL); } _ctsvc_ipc_connect(contact, ipc_data->ipc); ipc_data->list_handle = g_list_append(ipc_data->list_handle, contact); @@ -361,6 +367,7 @@ static void _ctsvc_ipc_recovery_foreach_cb(gpointer key, gpointer value, gpointe int ret = _ctsvc_ipc_create(&(ipc_data->ipc)); RETM_IF(CONTACTS_ERROR_NONE != ret, "_ctsvc_ipc_create() Fail(%d)", ret); + ctsvc_ipc_set_disconnected_cb(ipc_data->ipc, _ctsvc_ipc_disconnected_cb, NULL); for (c=ipc_data->list_handle;c;c=c->next) { contacts_h contact = c->data; diff --git a/client/ctsvc_client_noti.c b/client/ctsvc_client_noti.c index 23d2ed2..1c68e35 100644 --- a/client/ctsvc_client_noti.c +++ b/client/ctsvc_client_noti.c @@ -47,11 +47,6 @@ static int __ipc_pubsub_ref = 0; static pims_ipc_h __ipc = NULL; static GSList *__db_change_subscribe_list = NULL; -static void _ctsvc_ipc_disconnected_cb(void *user_data) -{ - ctsvc_ipc_set_disconnected(true); -} - static void __ctsvc_db_subscriber_callback(pims_ipc_h ipc, pims_ipc_data_h data, void *user_data) { int ret; @@ -106,7 +101,6 @@ int ctsvc_ipc_create_for_change_subscription() ctsvc_mutex_unlock(CTS_MUTEX_PIMS_IPC_PUBSUB); return CONTACTS_ERROR_IPC; } - ctsvc_ipc_set_disconnected_cb(__ipc, _ctsvc_ipc_disconnected_cb, NULL); } __ipc_pubsub_ref++; ctsvc_mutex_unlock(CTS_MUTEX_PIMS_IPC_PUBSUB); @@ -128,7 +122,6 @@ int ctsvc_ipc_recover_for_change_subscription() ctsvc_mutex_unlock(CTS_MUTEX_PIMS_IPC_PUBSUB); return CONTACTS_ERROR_IPC; } - ctsvc_ipc_set_disconnected_cb(__ipc, _ctsvc_ipc_disconnected_cb, NULL); ctsvc_mutex_unlock(CTS_MUTEX_PIMS_IPC_PUBSUB); return CONTACTS_ERROR_NONE; } -- 2.7.4