diff options
| author | Minsoo Kim <minnsoo.kim@samsung.com> | 2013-04-12 13:40:30 +0900 |
|---|---|---|
| committer | Minsoo Kim <minnsoo.kim@samsung.com> | 2013-04-12 13:40:30 +0900 |
| commit | f859398f457f9d4bed2b9a396fc6e1b444090f0a (patch) | |
| tree | 6807ed8ee6380dfed6e4308f3dfb1a1eadb03dd5 | |
| parent | 6a8e93a8dcdec88628560de64cbced6a534f4063 (diff) | |
| download | email-service-f859398f457f9d4bed2b9a396fc6e1b444090f0a.tar.gz email-service-f859398f457f9d4bed2b9a396fc6e1b444090f0a.tar.bz2 email-service-f859398f457f9d4bed2b9a396fc6e1b444090f0a.zip | |
N_SE-33706:fix db query fail
| -rwxr-xr-x | email-common-use/include/email-types.h | 4 | ||||
| -rwxr-xr-x | email-core/email-storage/email-storage.c | 8 | ||||
| -rwxr-xr-x | email-daemon/email-daemon-mail.c | 4 | ||||
| -rwxr-xr-x | packaging/email-service.spec | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/email-common-use/include/email-types.h b/email-common-use/include/email-types.h index 8659284..6edf1eb 100755 --- a/email-common-use/include/email-types.h +++ b/email-common-use/include/email-types.h @@ -780,8 +780,8 @@ typedef enum EMAIL_SORT_ATTACHMENT_LOW, EMAIL_SORT_FAVORITE_HIGH, EMAIL_SORT_FAVORITE_LOW, - EMAIL_SORT_MAILBOX_NAME_HIGH, - EMAIL_SORT_MAILBOX_NAME_LOW, + EMAIL_SORT_MAILBOX_ID_HIGH, + EMAIL_SORT_MAILBOX_ID_LOW, EMAIL_SORT_FLAGGED_FLAG_HIGH, EMAIL_SORT_FLAGGED_FLAG_LOW, EMAIL_SORT_SEEN_FLAG_HIGH, diff --git a/email-core/email-storage/email-storage.c b/email-core/email-storage/email-storage.c index 844153e..099fcd0 100755 --- a/email-core/email-storage/email-storage.c +++ b/email-core/email-storage/email-storage.c @@ -3222,8 +3222,12 @@ static int _write_conditional_clause_for_getting_mail_list(int account_id, int m " ORDER BY attachment_count ASC, date_time DESC", /* case EMAIL_SORT_ATTACHMENT_LOW: */ " ORDER BY lock_status DESC, date_time DESC", /* case EMAIL_SORT_FAVORITE_HIGH: */ " ORDER BY lock_status ASC, date_time DESC", /* case EMAIL_SORT_FAVORITE_LOW: */ - " ORDER BY mailbox_name DESC, date_time DESC", /* case EMAIL_SORT_MAILBOX_NAME_HIGH: */ - " ORDER BY mailbox_name ASC, date_time DESC" /* case EMAIL_SORT_MAILBOX_NAME_LOW: */ + " ORDER BY mailbox_id DESC, date_time DESC", /* case EMAIL_SORT_MAILBOX_ID_HIGH: */ + " ORDER BY mailbox_id ASC, date_time DESC", /* case EMAIL_SORT_MAILBOX_ID_LOW: */ + " ORDER BY flags_flagged_field DESC, date_time DESC", /* case EMAIL_SORT_FLAGGED_FLAG_HIGH: */ + " ORDER BY flags_flagged_field ASC, date_time DESC", /* case EMAIL_SORT_FLAGGED_FLAG_LOW: */ + " ORDER BY flags_seen_field DESC, date_time DESC", /* case EMAIL_SORT_SEEN_FLAG_HIGH: */ + " ORDER BY flags_seen_field ASC, date_time DESC" /* case EMAIL_SORT_SEEN_FLAG_LOW: */ }; if (sorting < EMAIL_SORT_END && sorting >= 0) diff --git a/email-daemon/email-daemon-mail.c b/email-daemon/email-daemon-mail.c index 1deb058..f390266 100755 --- a/email-daemon/email-daemon-mail.c +++ b/email-daemon/email-daemon-mail.c @@ -1332,7 +1332,7 @@ INTERNAL_FUNC int emdaemon_delete_mail_thread(int thread_id, int delete_always_f int mailbox_id, *mail_id_list = NULL, result_count = 0, i; email_mail_list_item_t *mail_list = NULL; - if (!emstorage_get_mail_list(0, 0, NULL, thread_id, -1, -1, 0, NULL, EMAIL_SORT_MAILBOX_NAME_HIGH, true, &mail_list, &result_count, &err) || !mail_list || !result_count) { + if (!emstorage_get_mail_list(0, 0, NULL, thread_id, -1, -1, 0, NULL, EMAIL_SORT_MAILBOX_ID_HIGH, true, &mail_list, &result_count, &err) || !mail_list || !result_count) { EM_DEBUG_EXCEPTION("emstorage_get_mail_list failed [%d]", err); goto FINISH_OFF; @@ -1383,7 +1383,7 @@ INTERNAL_FUNC int emdaemon_modify_seen_flag_of_thread(int thread_id, int seen_fl int account_id, *mail_id_list = NULL, result_count = 0, i; email_mail_list_item_t *mail_list = NULL; - if (!emstorage_get_mail_list(0, 0, NULL, thread_id, -1, -1, 0, NULL, EMAIL_SORT_MAILBOX_NAME_HIGH, true, &mail_list, &result_count, &err) || !mail_list || !result_count) { + if (!emstorage_get_mail_list(0, 0, NULL, thread_id, -1, -1, 0, NULL, EMAIL_SORT_MAILBOX_ID_HIGH, true, &mail_list, &result_count, &err) || !mail_list || !result_count) { EM_DEBUG_EXCEPTION("emstorage_get_mail_list failed [%d]", err); goto FINISH_OFF; diff --git a/packaging/email-service.spec b/packaging/email-service.spec index 9287c9d..7c194c3 100755 --- a/packaging/email-service.spec +++ b/packaging/email-service.spec @@ -1,6 +1,6 @@ Name: email-service Summary: E-mail Framework Middleware package -Version: 0.10.95 +Version: 0.10.96 Release: 1 Group: System/Libraries License: TBD |