merge setting latest from master

[apps/core/preloaded/email.git] / setting / src / email-view-sync-schedule.c

diff --git a/setting/src/email-view-sync-schedule.c b/setting/src/email-view-sync-schedule.c
index e75f361..4b117d2 100755 (executable)
--- a/setting/src/email-view-sync-schedule.c
+++ b/setting/src/email-view-sync-schedule.c
@@ -334,8 +334,8 @@ static void _push_naviframe(struct viewdata *vd)
        elm_object_style_set(p->r_button, "naviframe/title_icon");
        /*elm_object_text_set(p->r_button, _("IDS_EMAIL_OPT_REFRESH"));*/
        Evas_Object *ic = elm_icon_add(p->r_button);
-       elm_icon_file_set(ic, TITLE_ICON_REFRESH, NULL);
-       elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE);
+       elm_image_file_set(ic, TITLE_ICON_REFRESH, NULL);
+       elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
        evas_object_image_smooth_scale_set(ic, 0);
        elm_object_content_set(p->r_button, ic);
        evas_object_smart_callback_add(p->r_button, "clicked", _refresh_cb, vd);
@@ -358,11 +358,11 @@ static void _push_naviframe(struct viewdata *vd)
        account_user_data_t *user_data = (account_user_data_t *)account_data->user_data;
        Evas_Object *title_ic = elm_icon_add(vd->ugd->navi_bar);
        evas_object_size_hint_aspect_set(title_ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       elm_icon_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
+       elm_image_resizable_set(title_ic, EINA_TRUE, EINA_TRUE);
        if (user_data->is_preset_account > 0) {
-               elm_icon_file_set(title_ic, account_data->logo_icon_path, NULL);
+               elm_image_file_set(title_ic, account_data->logo_icon_path, NULL);
        } else {
-               elm_icon_file_set(title_ic, ACCOUNT_ICON_OTHERS, NULL);
+               elm_image_file_set(title_ic, ACCOUNT_ICON_OTHERS, NULL);
        }
 
        Elm_Object_Item *navi_it = NULL;