From 383537e4b93d0aa4496ca9c2161bfe42f13d12e4 Mon Sep 17 00:00:00 2001 From: "david8.kim" Date: Thu, 17 Jan 2013 13:33:01 +0900 Subject: [PATCH] fix prevent bugs. --- account/src/email-account.c | 4 ++-- mailbox/src/email-mailbox-controlbar.c | 5 ++--- mailbox/src/email-mailbox-list.c | 9 +++++++-- mailbox/src/email-mailbox.c | 3 ++- setting/src/email-view-account-options.c | 2 +- setting/src/email-view-account-setup.c | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/account/src/email-account.c b/account/src/email-account.c index d0dbd35..1419c89 100755 --- a/account/src/email-account.c +++ b/account/src/email-account.c @@ -837,7 +837,7 @@ static void _open_all_emails(void *data, Evas_Object *obj, void *event_info) static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv) { debug_log(""); - Evas_Object *base, *win; + Evas_Object *base; if (!ug || !priv) return; @@ -846,7 +846,7 @@ static void layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv) if (!base) return; - win = ug_get_window(); + ug_get_window(); switch (mode) { case UG_MODE_FULLVIEW: diff --git a/mailbox/src/email-mailbox-controlbar.c b/mailbox/src/email-mailbox-controlbar.c index b715456..a1e34e4 100755 --- a/mailbox/src/email-mailbox-controlbar.c +++ b/mailbox/src/email-mailbox-controlbar.c @@ -526,7 +526,6 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info) { debug_log(""); EmailMailboxUGD *mailbox_ugd = (EmailMailboxUGD *)data; - Elm_Object_Item *item; Evas_Object *genlist; if (mailbox_ugd->ctxpopup) { @@ -569,11 +568,11 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info) case VIEWBY_SENDER_ZTOA: case VIEWBY_UNREAD: case VIEWBY_ATTACHMENT: - item = elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL, + elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL, ELM_GENLIST_ITEM_NONE, _gl_viewby_popup_sel, NULL); break; case VIEWBY_IMPORTANT: - item = elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL, + elm_genlist_item_append(genlist, &itc_popup, &viewby_req[index], NULL, ELM_GENLIST_ITEM_NONE, _gl_viewby_popup_sel, NULL); break; case VIEWBY_UNKNOWN: diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c index 275e551..0a532fc 100755 --- a/mailbox/src/email-mailbox-list.c +++ b/mailbox/src/email-mailbox-list.c @@ -626,7 +626,7 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons } evas_object_size_hint_min_set(ld->flag_ic, 38, 38); return ld->flag_ic; - } + } } else if(!g_strcmp0(source, "elm.icon.4.touch")) { Evas_Object *rect = evas_object_rectangle_add(evas_object_evas_get(obj)); evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -1351,12 +1351,14 @@ static void _list_item_clicked(void *data, Evas_Object *obj, void *event_info) if (mbox->mailbox_type == EMAIL_MAILBOX_TYPE_DRAFT && email_engine_check_body_download(ld->mail_id)) { if (ld->mailbox_ugd->ug_composer) { debug_log("Composer UG is already launched"); + email_free_mailbox(&mbox, 1); return; } service_h service; if (SERVICE_ERROR_NONE != service_create(&service)) { debug_log("creating service handle failed"); + email_free_mailbox(&mbox, 1); return; } @@ -2614,12 +2616,15 @@ void _mailbox_list_add_item(EmailMailboxUGD *mailbox_ugd, gint mail_id) static void _clear_genlist(EmailMailboxUGD *mailbox_ugd) { - debug_log("VIEW TYPE[%d]",mailbox_ugd->view_type); + debug_log(); + if (mailbox_ugd == NULL) { debug_log("mailbox_ugd is NULL"); return; } + debug_log("VIEW TYPE[%d]",mailbox_ugd->view_type); + if (mailbox_ugd->gl[mailbox_ugd->view_type]) { elm_genlist_clear(mailbox_ugd->gl[mailbox_ugd->view_type]); _reset_refer_item_and_idx(mailbox_ugd); diff --git a/mailbox/src/email-mailbox.c b/mailbox/src/email-mailbox.c index bbe3316..35b9426 100755 --- a/mailbox/src/email-mailbox.c +++ b/mailbox/src/email-mailbox.c @@ -2045,7 +2045,8 @@ static void _add_account(void *data) mailbox_ugd->ug_setting = create_setting_ug(UG_NAME_EMAIL_SETTING, service, mailbox_ugd); - service_destroy(service); + ret = service_destroy(service); + debug_log("service_destroy: %d", ret); } static void _process_update(EmailMailboxUGD *mailbox_ugd) diff --git a/setting/src/email-view-account-options.c b/setting/src/email-view-account-options.c index e89fd28..b344ec7 100755 --- a/setting/src/email-view-account-options.c +++ b/setting/src/email-view-account-options.c @@ -495,7 +495,7 @@ static void _create_list(struct viewdata *vd) if (account_data->incoming_server_type == EMAIL_SERVER_TYPE_IMAP4 || account_data->incoming_server_type == EMAIL_SERVER_TYPE_POP3) { i = 6; - item = elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, + elm_genlist_item_append(p->genlist, &(p->itc_onoff), (void *)i, git, ELM_GENLIST_ITEM_NONE, _gl_sel_cb, (void *)i); } diff --git a/setting/src/email-view-account-setup.c b/setting/src/email-view-account-setup.c index 5ed1183..171def3 100755 --- a/setting/src/email-view-account-setup.c +++ b/setting/src/email-view-account-setup.c @@ -1491,7 +1491,7 @@ static void _backup_input_cb(void *data, Evas_Object *obj, void *event_info) p->str_password = NULL; } - p->str_password = g_strdup((char *)elm_entry_markup_to_utf8(elm_entry_entry_get(eo))); + p->str_password = (char *)elm_entry_markup_to_utf8(elm_entry_entry_get(eo)); } if (ugd->account_info == NULL) { -- 2.7.4