diff options
author | Jongkyu Koo <jk.koo@samsung.com> | 2016-10-13 12:23:37 -0700 |
---|---|---|
committer | intae jeon <intae.jeon@samsung.com> | 2016-10-13 12:31:34 -0700 |
commit | 5189786b257a608e73da2958643ce26734ddc035 (patch) | |
tree | 3a939f8ea8ab4e85b3943453fb32b8638356892a | |
parent | 7d6952649538aa242a989fe509ccee95c4a471ac (diff) | |
download | email-service-5189786b257a608e73da2958643ce26734ddc035.tar.gz email-service-5189786b257a608e73da2958643ce26734ddc035.tar.bz2 email-service-5189786b257a608e73da2958643ce26734ddc035.zip |
Revert "[P151125-03506] NAVER server's server search is not operated"submit/tizen_3.0_common/20161104.104000submit/tizen_3.0/20161028.082423submit/tizen_3.0/20161028.062323submit/tizen/20161013.193459accepted/tizen/wearable/20161014.005318accepted/tizen/mobile/20161014.005300accepted/tizen/ivi/20161014.005333accepted/tizen/common/20161014.043058accepted/tizen/3.0/wearable/20161028.133656accepted/tizen/3.0/mobile/20161028.133134accepted/tizen/3.0/ivi/20161028.134026
This reverts commit 123b523e7456e8c9e90d67f7f63b828c703e1c66.
Change-Id: Ic6be2932d736335a2f9ad646ada3b904811499b1
-rwxr-xr-x | email-common-use/include/email-debug-log.h | 2 | ||||
-rwxr-xr-x | email-core/email-core-mail.c | 21 | ||||
-rwxr-xr-x | email-core/email-storage/email-storage.c | 4 |
3 files changed, 3 insertions, 24 deletions
diff --git a/email-common-use/include/email-debug-log.h b/email-common-use/include/email-debug-log.h index 141da92..ef9141c 100755 --- a/email-common-use/include/email-debug-log.h +++ b/email-common-use/include/email-debug-log.h @@ -58,7 +58,7 @@ extern "C" #define LOG_TAG "EMAIL_SERVICE" -#define EM_DEBUG_LOG(format, arg...) SLOGW(format, ##arg) +#define EM_DEBUG_LOG(format, arg...) SLOGD(format, ##arg) #define EM_DEBUG_EXCEPTION(format, arg...) SLOGE("[EXCEPTION!] " format "\n", ##arg) #define EM_DEBUG_LOG_SEC(format, arg...) SECURE_SLOGD(format, ##arg) diff --git a/email-core/email-core-mail.c b/email-core/email-core-mail.c index 075595b..0e922ca 100755 --- a/email-core/email-core-mail.c +++ b/email-core/email-core-mail.c @@ -3940,26 +3940,7 @@ INTERNAL_FUNC int emcore_delete_mails_from_local_storage(char *multi_user_name, EM_DEBUG_EXCEPTION("emstorage_remove_downloaded_mail failed [%d]", err); goto FINISH_OFF; } - - /* Deleting search result mail's information */ - } else if (result_mail_list[i].mailbox_type == EMAIL_MAILBOX_TYPE_SEARCH_RESULT) { - /* searched mail uids */ - if (!emstorage_remove_downloaded_mail(multi_user_name, - account_id, - result_mail_list[i].mailbox_id, - EMAIL_SEARCH_RESULT_MAILBOX_NAME, - result_mail_list[i].server_mail_id, - false, - &err)) { - EM_DEBUG_EXCEPTION("emstorage_remove_downloaded_mail failed [%d]", err); - goto FINISH_OFF; - } - /* searched mail's partial body activity */ - if (!emcore_delete_pbd_activity(multi_user_name, account_id, result_mail_list[i].mail_id, 0, &err)) { - EM_DEBUG_EXCEPTION("emcore_delete_pbd_activity failed [%d]", err); - goto FINISH_OFF; - } - } + } } #ifdef __FEATURE_WIFI_AUTO_DOWNLOAD__ diff --git a/email-core/email-storage/email-storage.c b/email-core/email-storage/email-storage.c index 654d92f..5e3ca31 100755 --- a/email-core/email-storage/email-storage.c +++ b/email-core/email-storage/email-storage.c @@ -13437,7 +13437,7 @@ INTERNAL_FUNC int emstorage_get_pbd_mailbox_list(char *multi_user_name, int acco { EM_DEBUG_FUNC_BEGIN("account_id[%d], mailbox_list[%p], count[%p] err_code[%p]", account_id, mailbox_list, count, err_code); - if (account_id < FIRST_ACCOUNT_ID || NULL == mailbox_list || NULL == count) { + if (account_id < FIRST_ACCOUNT_ID || NULL == mailbox_list || *mailbox_list == NULL || NULL == count) { EM_DEBUG_EXCEPTION("account_id[%d], mailbox_list[%p], count[%p] err_code[%p]", account_id, mailbox_list, count, err_code); if (err_code != NULL) *err_code = EMAIL_ERROR_INVALID_PARAM; @@ -17840,8 +17840,6 @@ gint glist_compare_column_name(gconstpointer old_column_info, gconstpointer new_ if (old_column_info == NULL || new_column_info == NULL) return -1; - - EM_DEBUG_FUNC_END("error [%d]", error); return EM_SAFE_STRCMP((char*)left_one->column_name, (char*)right_one->column_name); } |