Merged with latest common/composer/viewer code

4 files changed, 43 insertions, 43 deletions

diff --git a/mailbox/src/email-mailbox-item.c b/mailbox/src/email-mailbox-item.c
index 55ae18b..0f96a24 100755
--- a/mailbox/src/email-mailbox-item.c
+++ b/mailbox/src/email-mailbox-item.c
@@ -220,8 +220,8 @@ static Evas_Object *_gl_mailbox_list_content_get(void *data, Evas_Object *obj, c
 		char folder_icon_path[1024] = { 0, };
 		Evas_Object *ic = elm_icon_add(obj);
 		snprintf(folder_icon_path, sizeof(folder_icon_path), IMGDIR "/U01_icon_folder.png");
-		elm_icon_file_set(ic, folder_icon_path, NULL);
-		elm_icon_resizable_set(ic, 0, 0);
+		elm_image_file_set(ic, folder_icon_path, NULL);
+		elm_image_resizable_set(ic, 0, 0);
 		evas_object_image_smooth_scale_set(ic, 0);
 		evas_object_show(ic);
 
diff --git a/mailbox/src/email-mailbox-list.c b/mailbox/src/email-mailbox-list.c
index 456afd9..b17c700 100755
--- a/mailbox/src/email-mailbox-list.c
+++ b/mailbox/src/email-mailbox-list.c
@@ -503,15 +503,15 @@ static void _item_followup_flag_touched_cb(void *data, Evas * evas, Evas_Object
 	{
 		case EMAIL_FLAG_TASK_STATUS_CLEAR:
 			ld->followup_flag = EMAIL_FLAG_TASK_STATUS_ACTIVE;
-			elm_icon_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Active.png", NULL);
+			elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Active.png", NULL);
 			break;
 		case EMAIL_FLAG_TASK_STATUS_ACTIVE:
 			ld->followup_flag = EMAIL_FLAG_TASK_STATUS_COMPLETE;
-			elm_icon_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Complete.png", NULL);
+			elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Complete.png", NULL);
 			break;
 		case EMAIL_FLAG_TASK_STATUS_COMPLETE:
 			ld->followup_flag = EMAIL_FLAG_TASK_STATUS_CLEAR;
-			elm_icon_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Clear.png", NULL);
+			elm_image_file_set(ld->flag_ic, IMGDIR "/M02_email_Flag_Clear.png", NULL);
 			break;
 		default :
 			debug_log("mail item has no followup flag");
@@ -553,22 +553,22 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 	} else if(!g_strcmp0(source, "elm.icon.2")){
 		if(ld->priority == EMAIL_OPTION_PRIORITY_HIGH) {
 			icon = elm_icon_add(obj);
-			elm_icon_file_set(icon, IMGDIR "/M02_email_icon_priority.png", NULL);
-			elm_icon_resizable_set(icon, 0, 0);
+			elm_image_file_set(icon, IMGDIR "/M02_email_icon_priority.png", NULL);
+			elm_image_resizable_set(icon, 0, 0);
 			evas_object_image_smooth_scale_set(icon, 0);
 			evas_object_show(icon);
 			return (void *)icon;
 		} else if(ld->reply_flag) {
 			icon = elm_icon_add(obj);
-			elm_icon_file_set(icon, IMGDIR "/M02_email_icon_reply.png", NULL);
-			elm_icon_resizable_set(icon, 0, 0);
+			elm_image_file_set(icon, IMGDIR "/M02_email_icon_reply.png", NULL);
+			elm_image_resizable_set(icon, 0, 0);
 			evas_object_image_smooth_scale_set(icon, 0);
 			evas_object_show(icon);
 			return (void *)icon;
 		} else if (ld->forward_flag) {
 			icon = elm_icon_add(obj);
-			elm_icon_file_set(icon, IMGDIR "/M02_email_icon_forward.png", NULL);
-			elm_icon_resizable_set(icon, 0, 0);
+			elm_image_file_set(icon, IMGDIR "/M02_email_icon_forward.png", NULL);
+			elm_image_resizable_set(icon, 0, 0);
 			evas_object_image_smooth_scale_set(icon, 0);
 			evas_object_show(icon);
 			return (void *)icon;
@@ -593,7 +593,7 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 		if(ld->is_attachment == true)
 		{
 			icon = elm_icon_add(obj);
-			elm_icon_file_set(icon, IMGDIR "/M02_email_icon_attach.png", NULL);
+			elm_image_file_set(icon, IMGDIR "/M02_email_icon_attach.png", NULL);
 			evas_object_size_hint_min_set(icon, 35, 35);
 			evas_object_show(icon);
 			elm_box_pack_start(box, icon);
@@ -693,8 +693,8 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 	{
 		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);
+			elm_image_file_set(ic, IMGDIR "/M02_email_icon_priority.png", NULL);
+			elm_image_resizable_set(ic, 0, 0);
 			evas_object_image_smooth_scale_set(ic, 0);
 			evas_object_show(ic);
 			return (void *)ic;
@@ -703,8 +703,8 @@ static Evas_Object *_gl_mail_item_content_get(void *data, Evas_Object *obj, cons
 			if(ld->item)
 				edje_object_signal_emit((Evas_Object *)elm_genlist_item_object_get(ld->item), "elm,state,priority", "elm");
 			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);
+			elm_image_file_set(ic, IMGDIR "/M02_email_icon_priority.png", NULL);
+			elm_image_resizable_set(ic, 0, 0);
 			evas_object_image_smooth_scale_set(ic, 0);
 			evas_object_show(ic);
 			return (void *)ic;
@@ -2595,7 +2595,7 @@ void _make_account_mail_list(void *data)
 			}
 				break;
 		}
-		elm_icon_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
+		elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
 		elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", _("IDS_EMAIL_HEADER_ALL_ACCOUNTS"));
 	}
 	else {
@@ -2609,13 +2609,13 @@ void _make_account_mail_list(void *data)
 		int err = 0;
 		err = email_get_account(mailbox_ugd->account_id, EMAIL_ACC_GET_OPT_DEFAULT, &account);
 		if (err == EMAIL_ERROR_NONE) {
-			elm_icon_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
+			elm_image_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
 		}
 
 		elm_object_part_text_set(mailbox_ugd->navi_title_ly, "txt_sub", mailbox_ugd->user_email);
 
 		if (account) {
-			elm_icon_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
+			elm_image_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
 			email_free_account(&account, 1);
 		}
 	}
diff --git a/mailbox/src/email-mailbox-search.c b/mailbox/src/email-mailbox-search.c
index 03cba67..266180b 100755
--- a/mailbox/src/email-mailbox-search.c
+++ b/mailbox/src/email-mailbox-search.c
@@ -101,8 +101,8 @@ void mailbox_create_searchbar(EmailMailboxUGD *mailbox_ugd)
 	//searchbar category button
 	mailbox_ugd->searchby_button = elm_button_add(searchbar_layout);
 	Evas_Object *searchby_icon = elm_icon_add(mailbox_ugd->searchby_button);
-	elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
-	elm_icon_resizable_set(searchby_icon, 0, 0);
+	elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
+	elm_image_resizable_set(searchby_icon, 0, 0);
 	evas_object_image_smooth_scale_set(searchby_icon, 0);
 	elm_object_content_set(mailbox_ugd->searchby_button, searchby_icon);
 	evas_object_smart_callback_add(mailbox_ugd->searchby_button, "clicked", _searchby_clicked_cb, mailbox_ugd);
@@ -188,15 +188,15 @@ static void _searchby_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 
 	Evas_Object* icon;
 	icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-	elm_icon_file_set(icon, IMGDIR "/M02_email_icon_popup_all.png", NULL);
+	elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_all.png", NULL);
 	elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, dgettext("sys_string", "IDS_COM_BODY_ALL"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
 	icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-	elm_icon_file_set(icon, IMGDIR "/M02_email_icon_popup_title.png", NULL);
+	elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_title.png", NULL);
 	elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, dgettext("sys_string", "IDS_COM_BODY_DETAILS_TITLE"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
 	icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-	elm_icon_file_set(icon, IMGDIR "/M02_email_icon_popup_sender.png", NULL);
+	elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_sender.png", NULL);
 
 	if ((mailbox_ugd->mailbox_type == EMAIL_MAILBOX_TYPE_SENTBOX)
 			|| (mailbox_ugd->mailbox_type == EMAIL_MAILBOX_TYPE_OUTBOX)
@@ -207,11 +207,11 @@ static void _searchby_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 	}
 
 	icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-	elm_icon_file_set(icon, IMGDIR "/M02_email_icon_popup_date.png", NULL);
+	elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_date.png", NULL);
 	elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, _("IDS_EMAIL_OPT_DATE"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
 	icon = elm_icon_add(mailbox_ugd->searchby_ctx_popup);
-	elm_icon_file_set(icon, IMGDIR "/M02_email_icon_popup_advanced.png", NULL);
+	elm_image_file_set(icon, IMGDIR "/M02_email_icon_popup_advanced.png", NULL);
 	elm_ctxpopup_item_append(mailbox_ugd->searchby_ctx_popup, _("IDS_EMAIL_OPT_ADVANCED"), icon, _searchby_ctxpopup_cb, mailbox_ugd);
 
 	_move_searchby_ctxpopup(mailbox_ugd->searchby_ctx_popup, obj);
@@ -282,26 +282,26 @@ static void _searchby_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info
 
 	if (search_type == EMAIL_SEARCH_ALL)		// All
 	{
-		elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
+		elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_all_press.png", NULL);
 	}
 	else if (search_type == EMAIL_SEARCH_SUBJECT)	// SUBJECT
 	{
-		elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_title_press.png", NULL);
+		elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_title_press.png", NULL);
 	}
 	else if (search_type == EMAIL_SEARCH_FROM || search_type == EMAIL_SEARCH_TO)	// FROM or Recipient(TO)
 	{
-		elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_sender_press.png", NULL);
+		elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_sender_press.png", NULL);
 	}
 	else if (search_type == EMAIL_SEARCH_DATE)	// Date
 	{
-		elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_date_press.png", NULL);
+		elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_date_press.png", NULL);
 	}
 	else if (search_type == EMAIL_SEARCH_ADVANCED)	// Advanced
 	{
-		elm_icon_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_advanced_press.png", NULL);
+		elm_image_file_set(searchby_icon, IMGDIR"/M02_email_icon_popup_advanced_press.png", NULL);
 	}
 
-	elm_icon_resizable_set(searchby_icon, 0, 0);
+	elm_image_resizable_set(searchby_icon, 0, 0);
 	evas_object_image_smooth_scale_set(searchby_icon, 0);
 	elm_object_content_set(mailbox_ugd->searchby_button, searchby_icon);
 
diff --git a/mailbox/src/email-mailbox.c b/mailbox/src/email-mailbox.c
index 4acd2e7..99ad77b 100755
--- a/mailbox/src/email-mailbox.c
+++ b/mailbox/src/email-mailbox.c
@@ -1111,7 +1111,7 @@ void destroy_account_cb(ui_gadget_h ug, void *priv)
 
 		if (oh_opened)
 		{
-			elm_icon_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
+			elm_image_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
 			elm_object_item_data_set(nf_it, (void *) (!oh_opened));
 		}
 
@@ -1551,8 +1551,8 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
 	mailbox_ugd->folder_button = elm_button_add(mailbox_ugd->navi_bar);
 	elm_object_style_set(mailbox_ugd->folder_button, "naviframe/title_icon");
 	Evas_Object *folder_icon = elm_icon_add(mailbox_ugd->folder_button);
-	elm_icon_file_set(folder_icon, ICON_FOLDERS, NULL);
-	elm_icon_resizable_set(folder_icon, 1, 1);
+	elm_image_file_set(folder_icon, ICON_FOLDERS, NULL);
+	elm_image_resizable_set(folder_icon, 1, 1);
 	evas_object_image_smooth_scale_set(folder_icon, 0);
 	elm_object_content_set(mailbox_ugd->folder_button, folder_icon);
 	evas_object_smart_callback_add(mailbox_ugd->folder_button, "clicked", _folder_cb, mailbox_ugd);
@@ -1562,8 +1562,8 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
 	mailbox_ugd->update_button = elm_button_add(mailbox_ugd->navi_bar);
 	elm_object_style_set(mailbox_ugd->update_button, "naviframe/title_icon");
 	Evas_Object *update_icon = elm_icon_add(mailbox_ugd->update_button);
-	elm_icon_file_set(update_icon, ICON_UPDATE, NULL);
-	elm_icon_resizable_set(update_icon, 1, 1);
+	elm_image_file_set(update_icon, ICON_UPDATE, NULL);
+	elm_image_resizable_set(update_icon, 1, 1);
 	evas_object_image_smooth_scale_set(update_icon, 0);
 	elm_object_content_set(mailbox_ugd->update_button, update_icon);
 	evas_object_smart_callback_add(mailbox_ugd->update_button, "clicked", _update_toolbar_clicked_cb, mailbox_ugd);
@@ -1587,13 +1587,13 @@ static void _create_view(EmailMailboxUGD *mailbox_ugd)
 	mailbox_ugd->sp_icon = elm_icon_add(mailbox_ugd->navi_title_ly);
 	evas_object_show(mailbox_ugd->sp_icon);
 	elm_object_part_content_set(mailbox_ugd->navi_title_ly, "sub_left_icon", mailbox_ugd->sp_icon);
-	elm_icon_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
+	elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
 
 	// add expand/collapse icon
 	mailbox_ugd->title_arrow = elm_icon_add(mailbox_ugd->navi_title_ly);
 	evas_object_show(mailbox_ugd->title_arrow);
 	elm_object_part_content_set(mailbox_ugd->navi_title_ly, "sub_right_icon", mailbox_ugd->title_arrow);
-	elm_icon_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
+	elm_image_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
 
 	_create_controlbar(mailbox_ugd);
 
@@ -1612,7 +1612,7 @@ static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission
 
 	if (oh_opened)
 	{
-		elm_icon_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
+		elm_image_file_set(mailbox_ugd->title_arrow, ICON_CLOSE, NULL);
 		destroy_account_cb(mailbox_ugd->ug_account, mailbox_ugd);
 		elm_object_item_data_set(nf_it, (void *) (!oh_opened));
 	}
@@ -1620,7 +1620,7 @@ static void _title_clicked_cb(void *data, Evas_Object *obj, const char *emission
 	{
 		if (mailbox_ugd->view_type != EMAIL_VIEW_EDIT && mailbox_ugd->view_type != EMAIL_VIEW_SEARCH)
 		{
-			elm_icon_file_set(mailbox_ugd->title_arrow, ICON_OPEN, NULL);
+			elm_image_file_set(mailbox_ugd->title_arrow, ICON_OPEN, NULL);
 			_account_cb(data, obj, NULL);
 			elm_object_item_data_set(nf_it, (void *) (!oh_opened));
 		}
@@ -1997,7 +1997,7 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
 
 	if (mailbox_ugd->mode == EMAIL_MAILBOX_MODE_ALL) {
 
-		elm_icon_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
+		elm_image_file_set(mailbox_ugd->sp_icon, ICON_TITLE_ALL_ACC, NULL);
 
 		switch(mailbox_ugd->mailbox_type)
 		{
@@ -2066,7 +2066,7 @@ void _update_navigationbar_title(EmailMailboxUGD *mailbox_ugd)
 		email_account_t *account;
 		email_get_account(mailbox_ugd->account_id, 0, &account);
 		if (account) {
-			elm_icon_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
+			elm_image_file_set(mailbox_ugd->sp_icon, account->logo_icon_path, NULL);
 			email_free_account(&account, 1);
 		}
 	}