From 20faabe48c932382b820c3d80f1a501517e3cbe5 Mon Sep 17 00:00:00 2001 From: "david8.kim" Date: Wed, 10 Oct 2012 19:02:26 +0900 Subject: [PATCH] remove remaining build errors and warnings --- mailbox/src/email-mailbox-controlbar.c | 26 -------------------------- mailbox/src/email-mailbox-item.c | 20 +++----------------- mailbox/src/email-mailbox-list.c | 20 ++++++++++---------- mailbox/src/email-mailbox-noti-mgr.c | 4 ++-- 4 files changed, 15 insertions(+), 55 deletions(-) diff --git a/mailbox/src/email-mailbox-controlbar.c b/mailbox/src/email-mailbox-controlbar.c index 63a16d7..96cdd3b 100755 --- a/mailbox/src/email-mailbox-controlbar.c +++ b/mailbox/src/email-mailbox-controlbar.c @@ -47,7 +47,6 @@ extern int ug_pushed; static Evas_Object *create_control_option(EmailMailboxUGD *ad); static Evas_Object *create_edit_control_option(EmailMailboxUGD *ad); static void _viewby_cb(void *data, Evas_Object *obj, void *event_info); -static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_info); static void _delete_all_emails_cb(void *data, Evas_Object *obj, void *event_info); static void _document_search_cb(void *data, Evas_Object *obj, void *event_info); static void _delete_mail_cb(void *data, Evas_Object *obj, void *event_info); @@ -59,7 +58,6 @@ static void _popup_response_cb(void *data, Evas_Object *obj, void *event_info); static void destroy_document_cb(ui_gadget_h ug, void *priv); static void _radio_cb(void *data, Evas_Object *obj, void *event_info); static void _move_ctxpopup(Evas_Object *ctxpopup, Evas_Object *win); -static void _mousedown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _move_mail_cb(void *data, Evas_Object *obj, void *event_info); @@ -417,18 +415,6 @@ static void _document_search_cb(void *data, Evas_Object *obj, void *event_info) service_destroy(service); } -static void _more_toolbar_clicked_cb(void *data, Evas_Object *obj, void *event_info) -{ - debug_log(""); - EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data; - mailbox_ugd->ctxpopup = elm_ctxpopup_add(mailbox_ugd->navi_bar); - evas_object_smart_callback_add(mailbox_ugd->ctxpopup, "dismissed", _dismissed_cb, mailbox_ugd); - elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_DELETE_ALL"), NULL, _delete_all_emails_cb, mailbox_ugd); - elm_ctxpopup_item_append(mailbox_ugd->ctxpopup, _("IDS_EMAIL_OPT_DOCUMENTS_ABB"), NULL, _document_search_cb, mailbox_ugd); - _move_ctxpopup(mailbox_ugd->ctxpopup, mailbox_ugd->win_main); - evas_object_show(mailbox_ugd->ctxpopup); -} - static void _move_ctxpopup(Evas_Object *ctxpopup, Evas_Object *win) { Evas_Coord w, h; @@ -801,18 +787,6 @@ static Evas_Object *create_control_option(EmailMailboxUGD *mailbox_ugd) } -static void _mousedown_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) -{ - Evas_Event_Mouse_Down *ev = event_info; - - if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) - return; - - touch_x = ev->canvas.x; - touch_y = ev->canvas.y; -} - - static Evas_Object *create_edit_control_option(EmailMailboxUGD *mailbox_ugd) { debug_log(""); diff --git a/mailbox/src/email-mailbox-item.c b/mailbox/src/email-mailbox-item.c index 6e3680d..5a60cf9 100755 --- a/mailbox/src/email-mailbox-item.c +++ b/mailbox/src/email-mailbox-item.c @@ -651,29 +651,15 @@ void _resend_mail_cb(void *data, Evas_Object *obj, void *event_info) return; } - unsigned handle = 0; + int handle = 0; list_data *ld = (list_data *)data; - email_account_t *account = NULL; - - /* Get sending option for account from email-service */ - int err = email_get_account(ld->account_id, ONLY_OPTION, &account); - if (err != EMAIL_ERROR_NONE) { - debug_warning("email_get_account acct(%d) - err(%d)", ld->account_id, err); - goto CLEANUP; - } - - /* Send email again */ - err = email_send_mail(ld->mail_id, &(account->options), &handle); + /* Send email again */ + int err = email_send_mail(ld->mail_id, &handle); if ( err != EMAIL_ERROR_NONE ) { debug_warning("email_send_mail acct(%d) - err(%d)", ld->account_id, err); } - - -CLEANUP: - if(account) email_free_account(&account, 1); - } void _cancel_send_mail_cb(void *data, Evas_Object *obj, void *event_info) diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c index 9ae0808..b972e68 100755 --- a/mailbox/src/email-mailbox-list.c +++ b/mailbox/src/email-mailbox-list.c @@ -1538,14 +1538,14 @@ list_data *make_list_data(email_mail_list_item_t* mail_info, const EmailSearchDa /* info field. */ ld->mail_id = mail_info->mail_id; ld->is_seen = mail_info->flags_seen_field; - ld->is_attachment = mail_info->has_attachment; + ld->is_attachment = mail_info->attachment_count; ld->priority = mail_info->priority; - ld->is_body_download = mail_info->is_text_downloaded; + ld->is_body_download = mail_info->body_download_status; ld->account_id = mail_info->account_id; ld->imp_sel = mail_info->flags_flagged_field; ld->is_sending_now = mail_info->save_status; ld->mailbox_id = mail_info->mailbox_id; - ld->preview_body = STRNDUP(mail_info->previewBodyText, MAX_PREVIEW_TEXT_LENGTH - 1); + ld->preview_body = STRNDUP(mail_info->preview_text, MAX_PREVIEW_TEXT_LENGTH - 1); ld->reply_flag = mail_info->flags_answered_field; ld->forward_flag = mail_info->flags_forwarded_field; ld->followup_flag = mail_info->flags_flagged_field; @@ -1555,14 +1555,14 @@ list_data *make_list_data(email_mail_list_item_t* mail_info, const EmailSearchDa ld->absolute_time = mail_info->date_time; /* sender. */ - ld->sender = (STR_VALID(mail_info->from_email_address))? - STRNDUP(mail_info->from_email_address, ADDR_LEN - 1) : + ld->sender = (STR_VALID(mail_info->email_address_sender))? + STRNDUP(mail_info->email_address_sender, ADDR_LEN - 1) : STRNDUP(_("IDS_EMAIL_POP_NO_SENDER"), ADDR_LEN - 1); - UTF8_VALIDATE(mail_info->from, FROM_LEN - 1); - ld->alias = GET_NAME_FROM_ALIAS(mail_info->from, FROM_LEN - 1); + UTF8_VALIDATE(mail_info->full_address_from, FROM_LEN - 1); + ld->alias = GET_NAME_FROM_ALIAS(mail_info->full_address_from, FROM_LEN - 1); debug_log("alias: %s", ld->alias); if(mailbox_ugd->mode == EMAIL_MAILBOX_MODE_MAILBOX && @@ -1570,13 +1570,13 @@ list_data *make_list_data(email_mail_list_item_t* mail_info, const EmailSearchDa ld->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX || ld->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT)) { /* recipient display name from email alais */ - UTF8_VALIDATE(mail_info->recipients, RECIPIENT_LEN - 1); - ld->recipient = GET_NAME_FROM_ALIAS(mail_info->recipients, RECIPIENT_LEN - 1); + UTF8_VALIDATE(mail_info->email_address_recipient, RECIPIENT_LEN - 1); + ld->recipient = GET_NAME_FROM_ALIAS(mail_info->email_address_recipient, RECIPIENT_LEN - 1); debug_log("info->recipient: %s", ld->recipient); } else { /* sender display name from email alias */ if (mailbox_ugd->view_type == EMAIL_VIEW_SEARCH) { - char *from = GET_NAME_FROM_ALIAS(mail_info->from, FROM_LEN - 1); + char *from = GET_NAME_FROM_ALIAS(mail_info->full_address_from, FROM_LEN - 1); char *_from = elm_entry_utf8_to_markup(from); char *_search_sender = NULL; int from_len = STR_LEN(_from); /* it is never zero */ diff --git a/mailbox/src/email-mailbox-noti-mgr.c b/mailbox/src/email-mailbox-noti-mgr.c index 4f5de4d..9316701 100755 --- a/mailbox/src/email-mailbox-noti-mgr.c +++ b/mailbox/src/email-mailbox-noti-mgr.c @@ -627,8 +627,8 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message) email_mail_list_item_t* mail_info = NULL; mail_info = get_mail_info(mailid); if(!mail_info) break; - ld->is_attachment = mail_info->has_attachment; - ld->preview_body = STRNDUP(mail_info->previewBodyText, MAX_PREVIEW_TEXT_LENGTH-1); + ld->is_attachment = mail_info->attachment_count; + ld->preview_body = STRNDUP(mail_info->preview_text, MAX_PREVIEW_TEXT_LENGTH - 1); elm_genlist_item_update(ld->item); FREE(mail_info); } -- 2.7.4