Apply mailbox latest codes

4 files changed, 22 insertions, 16 deletions

diff --git a/mailbox/src/email-mailbox-controlbar.c b/mailbox/src/email-mailbox-controlbar.c
index 8e7865a..d253306 100755
--- a/mailbox/src/email-mailbox-controlbar.c
+++ b/mailbox/src/email-mailbox-controlbar.c
@@ -651,7 +651,7 @@ static void _viewby_cb(void *data, Evas_Object *obj, void *event_info)
 	if (index > 4)
 		index = 4;
 	Evas_Object *box = elm_box_add(mailbox_ugd->viewby_popup);
-	evas_object_size_hint_min_set(box, 610 * elm_scale_get(), 114 * index * elm_scale_get());
+	evas_object_size_hint_min_set(box, 610 * elm_scale_get(), 113 * index * elm_scale_get());
 	evas_object_show(genlist);
 	elm_box_pack_end(box, genlist);
 	elm_object_content_set(mailbox_ugd->viewby_popup, box);
diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c
index 2c4b984..0b6bbe9 100755
--- a/mailbox/src/email-mailbox-list.c
+++ b/mailbox/src/email-mailbox-list.c
@@ -461,10 +461,13 @@ static void _realized_cb(void *data, Evas_Object *obj, void *event_info)
 	if (ld->is_attachment == true) {
 		elm_object_item_signal_emit(ld->item, "elm,state,attach", "elm");
 	}
+#if 0	// priority icon position is the same with the lastverb icon position
 	if(ld->priority != EMAIL_OPTION_PRIORITY_NORMAL) {
 		elm_object_item_signal_emit(ld->item, "elm,state,priority", "elm");
 	}
-	if(ld->reply_flag || ld->forward_flag) {
+#endif
+
+	if( ld->priority == EMAIL_OPTION_PRIORITY_HIGH || ld->reply_flag || ld->forward_flag) {
 		elm_object_item_signal_emit(ld->item, "elm,state,lastverb", "elm");
 	}
 
@@ -747,7 +750,7 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 			return (void *)ic;
 		}
 	}
-
+#if 0	// support low priority message, priority icon postion is changed
 	else if(!g_strcmp0(source, "elm.icon.priority"))
 	{
 		if(ld->priority == EMAIL_OPTION_PRIORITY_HIGH) {
@@ -758,7 +761,6 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 			evas_object_show(ic);
 			return (void *)ic;
 		}
-#if 0	// support low priority message
 		else if(ld->priority == EMAIL_OPTION_PRIORITY_LOW) {
 			if(ld->item)
 				edje_object_signal_emit((Evas_Object *)elm_genlist_item_object_get(ld->item), "elm,state,priority", "elm");
@@ -769,14 +771,18 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 			evas_object_show(ic);
 			return (void *)ic;
 		}
-#endif
 	}
-
+#endif
 	else if(!g_strcmp0(source, "elm.icon.lastverb"))
 	{
-
-		if(ld->reply_flag || ld->forward_flag)
-		{
+		if(ld->priority == EMAIL_OPTION_PRIORITY_HIGH) {
+			Evas_Object *ic = elm_icon_add(obj);
+			elm_icon_file_set(ic, IMGDIR "/M02_email_icon_priority.png", NULL);
+			elm_icon_resizable_set(ic, 0, 0);
+			evas_object_image_smooth_scale_set(ic, 0);
+			evas_object_show(ic);
+			return (void *)ic;
+		} else	if(ld->reply_flag || ld->forward_flag)	{
 			Evas_Object *ic = elm_icon_add(obj);
 
 			if(ld->reply_flag == true)
diff --git a/mailbox/src/email-mailbox-noti-mgr.c b/mailbox/src/email-mailbox-noti-mgr.c
index 9e92343..e0cb85f 100755
--- a/mailbox/src/email-mailbox-noti-mgr.c
+++ b/mailbox/src/email-mailbox-noti-mgr.c
@@ -622,7 +622,7 @@ static void _edbus_event_mailbox_receive(void *local_data, DBusMessage *message)
 				mailid = data2;
 				int type = data4;
 
-				if(type == UPDATE_PARTIAL_BODY_DOWNLOAD) {
+				if(type == UPDATE_PARTIAL_BODY_DOWNLOAD || type == APPEND_BODY) {
 					list_data *ld = _find_mailinfo_by_mailid(mailid, mailbox_ugd->list_data[view_type]);
 					if(ld) {
 						email_mail_list_item_t* mail_info = NULL;
@@ -654,6 +654,10 @@ 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->attachment_count;
+						if (ld->preview_body)
+							FREE(ld->preview_body);
+						ld->preview_body = STRNDUP(mail_info->preview_text, MAX_PREVIEW_TEXT_LENGTH - 1);
 						ld->is_seen = mail_info->flags_seen_field;
 						ld->followup_flag = mail_info->flags_flagged_field;
 						ld->reply_flag = mail_info->flags_answered_field;
diff --git a/mailbox/src/email-mailbox.c b/mailbox/src/email-mailbox.c
index 617d528..55049e3 100755
--- a/mailbox/src/email-mailbox.c
+++ b/mailbox/src/email-mailbox.c
@@ -1241,12 +1241,8 @@ void _stop_emf_job(EmailMailboxUGD *mailbox_ugd, int handle, gboolean change_dow
 	debug_log("");
 	gint account_id = mailbox_ugd->account_id;
 
-	if (handle > 0) {
-		debug_log("stop job - handle (%d)", handle);
-		email_engine_stop_working(account_id, handle);
-	} else {
-		debug_warning("handle1 is %d. so we can't call email_engine_stop_working()", handle);
-	}
+	debug_log("stop job - handle (%d)", handle);
+	email_engine_stop_working(account_id, handle);
 
 	mailbox_ugd->emf_handle = 0;
 	_reset_refer_item_and_idx(mailbox_ugd);