diff options
| author | intae jeon <intae.jeon@samsung.com> | 2016-10-13 12:30:43 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-10-13 12:30:43 -0700 |
| commit | 51f6049e0a4c0d23d06d33863e9d869b3ea8c2dd (patch) | |
| tree | 7066ab7685fd041292416afd5b8b4b6c4049df0a | |
| parent | 0ef29f5e7b7da6bb9ec96aea1f0ace3108271154 (diff) | |
| parent | a67cfcc03165abb52a34a46c6eb0668f9d0eafe6 (diff) | |
| download | email-service-51f6049e0a4c0d23d06d33863e9d869b3ea8c2dd.tar.gz email-service-51f6049e0a4c0d23d06d33863e9d869b3ea8c2dd.tar.bz2 email-service-51f6049e0a4c0d23d06d33863e9d869b3ea8c2dd.zip | |
Merge "Revert "connection info was maintained even if IDLE command is failed"" into tizen
| -rwxr-xr-x | email-common-use/include/email-internal-types.h | 2 | ||||
| -rwxr-xr-x | email-core/email-core-imap-idle.c | 39 |
2 files changed, 19 insertions, 22 deletions
diff --git a/email-common-use/include/email-internal-types.h b/email-common-use/include/email-internal-types.h index a009db3..98620b9 100755 --- a/email-common-use/include/email-internal-types.h +++ b/email-common-use/include/email-internal-types.h @@ -240,7 +240,7 @@ typedef pthread_t thread_t; #define INLINE_ATTACHMENT 1 #define ATTACHMENT 2 -#define EVENT_QUEUE_MAX 64 +#define EVENT_QUEUE_MAX 32 #define EMAIL_LAUNCHED_BY_UNKNOWN_METHOD 0 #define EMAIL_LAUNCHED_BY_DBUS_ACTIVATION 1 diff --git a/email-core/email-core-imap-idle.c b/email-core/email-core-imap-idle.c index 3d97cb3..50f45a1 100755 --- a/email-core/email-core-imap-idle.c +++ b/email-core/email-core-imap-idle.c @@ -340,7 +340,7 @@ static int emcore_connect_and_idle_on_mailbox(char *multi_user_name, /* Send IDLE command */ if (!imap_local->netstream || !net_sout(imap_local->netstream, cmd, (int)EM_SAFE_STRLEN(cmd))) { - EM_DEBUG_EXCEPTION("network error - failed to IDLE on Mailbox - [%d]", input_mailbox->mailbox_id); + EM_DEBUG_EXCEPTION_SEC("network error - failed to IDLE on Mailbox - %s ", input_mailbox->mailbox_name); err = EMAIL_ERROR_IMAP4_IDLE_FAILURE; goto FINISH_OFF; } @@ -349,39 +349,36 @@ static int emcore_connect_and_idle_on_mailbox(char *multi_user_name, while (imap_local->netstream) { p = net_getline(imap_local->netstream); - EM_DEBUG_LOG("IDLE command response: [%s]", p); + EM_DEBUG_LOG("p =[%s]", p); - if (p && '+' == *p) { + if (p && !strncmp(p, "+", 1)) { EM_DEBUG_LOG("OK. Go."); break; - } else if (p && '*' == *p) { + } else if (p && !strncmp(p, "*", 1)) { EM_SAFE_FREE(p); continue; } else { - EM_DEBUG_EXCEPTION("Unsuspected response: [%s]", p); + EM_DEBUG_LOG("Unsuspected response."); err = EMAIL_ERROR_IMAP4_IDLE_FAILURE; break; } - } - + } EM_SAFE_FREE(p); - if (err == EMAIL_ERROR_NONE) { - connection_info = em_malloc(sizeof(email_imap_idle_connection_info_t)); - if (connection_info == NULL) { - EM_DEBUG_EXCEPTION("EMAIL_ERROR_OUT_OF_MEMORY"); - err = EMAIL_ERROR_OUT_OF_MEMORY; - goto FINISH_OFF; - } + connection_info = em_malloc(sizeof(email_imap_idle_connection_info_t)); + if (connection_info == NULL) { + EM_DEBUG_EXCEPTION("EMAIL_ERROR_OUT_OF_MEMORY"); + err = EMAIL_ERROR_OUT_OF_MEMORY; + goto FINISH_OFF; + } - connection_info->account_id = input_account->account_id; - connection_info->mailbox_id = input_mailbox->mailbox_id; - connection_info->mail_stream = mail_stream; - connection_info->socket_fd = socket_fd; - connection_info->multi_user_name = EM_SAFE_STRDUP(multi_user_name); + connection_info->account_id = input_account->account_id; + connection_info->mailbox_id = input_mailbox->mailbox_id; + connection_info->mail_stream = mail_stream; + connection_info->socket_fd = socket_fd; + connection_info->multi_user_name = EM_SAFE_STRDUP(multi_user_name); - imap_idle_connection_list = g_list_append(imap_idle_connection_list, (gpointer)connection_info); - } + imap_idle_connection_list = g_list_append(imap_idle_connection_list, (gpointer)connection_info); FINISH_OFF: |