diff options
author | Donghee Ye <donghee.ye@samsung.com> | 2013-04-18 19:29:40 +0900 |
---|---|---|
committer | Donghee Ye <donghee.ye@samsung.com> | 2013-04-18 19:29:40 +0900 |
commit | 5069d2e79fb52a10de5d62f9eba13f989fb1bf0d (patch) | |
tree | e79f74766f7bf231f1c5c68659e70674df1cb4df /server | |
parent | 809f70a4ebc4be59bb7c9b8be897c786915e76a1 (diff) | |
download | contacts-service-5069d2e79fb52a10de5d62f9eba13f989fb1bf0d.tar.gz contacts-service-5069d2e79fb52a10de5d62f9eba13f989fb1bf0d.tar.bz2 contacts-service-5069d2e79fb52a10de5d62f9eba13f989fb1bf0d.zip |
Update version 0.9.68.1
- Fix : vcard createion which contact data has new line (Base64 encoding)
- Fix : get contact/my_profile record which has not child record
- Change : private vconf value setting (default language)
Change-Id: Idd4842745afb5da64953a3bb1672f86fdb8a65fe
Diffstat (limited to 'server')
-rwxr-xr-x | server/CMakeLists.txt | 1 | ||||
-rw-r--r-- | server/ctsvc_ipc_server2.c | 38 | ||||
-rw-r--r-- | server/ctsvc_ipc_server2.h | 2 | ||||
-rw-r--r-- | server/ctsvc_server.c | 2 | ||||
-rwxr-xr-x | server/ctsvc_server_utils.c | 1 |
5 files changed, 42 insertions, 2 deletions
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index e55d364..0fa2899 100755 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -61,7 +61,6 @@ SET(SRCS ${CMAKE_SOURCE_DIR}/common/ctsvc_record_sdn.c ${CMAKE_SOURCE_DIR}/common/ctsvc_record_speeddial.c ${CMAKE_SOURCE_DIR}/common/ctsvc_record_updated_info.c - ${CMAKE_SOURCE_DIR}/common/ctsvc_common_setting.c ${CMAKE_SOURCE_DIR}/common/ctsvc_sim.c ${CMAKE_SOURCE_DIR}/common/ctsvc_socket.c ${CMAKE_SOURCE_DIR}/common/ctsvc_vcard.c diff --git a/server/ctsvc_ipc_server2.c b/server/ctsvc_ipc_server2.c index 3fd4542..da41515 100644 --- a/server/ctsvc_ipc_server2.c +++ b/server/ctsvc_ipc_server2.c @@ -994,3 +994,41 @@ ERROR_RETURN: return; } +void ctsvc_ipc_utils_get_index_characters(pims_ipc_h ipc, pims_ipc_data_h indata, + pims_ipc_data_h *outdata, void *userdata) +{ + int ret = CONTACTS_ERROR_NONE; + char *indexs = NULL; + + ret = contacts_utils_get_index_characters(&indexs); + + if (outdata) { + *outdata = pims_ipc_data_create(0); + if (!*outdata) { + ERR("pims_ipc_data_create fail"); + free(indexs); + return; + } + if (pims_ipc_data_put(*outdata, (void*)&ret, sizeof(int)) != 0) { + pims_ipc_data_destroy(*outdata); + *outdata = NULL; + ERR("pims_ipc_data_put fail (return value)"); + free(indexs); + return; + } + ret = ctsvc_ipc_marshal_string(indexs, *outdata); + if (ret != CONTACTS_ERROR_NONE) { + CTS_ERR("ctsvc_ipc_marshal_string fail"); + pims_ipc_data_destroy(*outdata); + free(indexs); + return; + } + } + else { + ERR("outdata is NULL"); + } + + free(indexs); + return; +} + diff --git a/server/ctsvc_ipc_server2.h b/server/ctsvc_ipc_server2.h index f107ccb..04e1957 100644 --- a/server/ctsvc_ipc_server2.h +++ b/server/ctsvc_ipc_server2.h @@ -44,4 +44,6 @@ void ctsvc_ipc_setting_set_name_display_order(pims_ipc_h ipc, pims_ipc_data_h in void ctsvc_ipc_setting_get_name_sorting_order(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ipc_data_h *outdata, void *userdata); void ctsvc_ipc_setting_set_name_sorting_order(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ipc_data_h *outdata, void *userdata); +void ctsvc_ipc_utils_get_index_characters(pims_ipc_h ipc, pims_ipc_data_h indata, pims_ipc_data_h *outdata, void *userdata); + #endif /*__CTSVC_IPC_SERVER2_H__*/ diff --git a/server/ctsvc_server.c b/server/ctsvc_server.c index 1c60601..e4d5e76 100644 --- a/server/ctsvc_server.c +++ b/server/ctsvc_server.c @@ -93,6 +93,8 @@ static int __server_main(void) if (pims_ipc_svc_register(CTSVC_IPC_SETTING_MODULE, CTSVC_IPC_SERVER_SETTING_GET_NAME_SORTING_ORDER, ctsvc_ipc_setting_get_name_sorting_order, NULL) != 0) break; if (pims_ipc_svc_register(CTSVC_IPC_SETTING_MODULE, CTSVC_IPC_SERVER_SETTING_SET_NAME_SORTING_ORDER, ctsvc_ipc_setting_set_name_sorting_order, NULL) != 0) break; + if (pims_ipc_svc_register(CTSVC_IPC_UTILS_MODULE, CTSVC_IPC_SERVER_UTILS_GET_INDEX_CHARACTERS, ctsvc_ipc_utils_get_index_characters, NULL) != 0) break; + pims_ipc_svc_init_for_publish(CTSVC_IPC_SOCKET_PATH_FOR_CHANGE_SUBSCRIPTION, CTS_SECURITY_FILE_GROUP, 0660); ret = contacts_connect2(); diff --git a/server/ctsvc_server_utils.c b/server/ctsvc_server_utils.c index eb8d727..faa599e 100755 --- a/server/ctsvc_server_utils.c +++ b/server/ctsvc_server_utils.c @@ -23,7 +23,6 @@ #include "internal.h" #include "ctsvc_setting.h" -#include "ctsvc_common_setting.h" #include "ctsvc_server_utils.h" #include "ctsvc_server_sim.h" #include "ctsvc_server_sqlite.h" |