fix import paths 06/204406/2 submit/tizen/20190430.072522
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Tue, 23 Apr 2019 07:46:00 +0000 (09:46 +0200)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Tue, 23 Apr 2019 12:23:18 +0000 (14:23 +0200)
Change-Id: I97874fa7475a5ecec283a194ad63a8f22e19ac80

setting-font/src/setting-font-main.c
setting-font/src/setting-font.c
setting-profile-common/src/setting-profile-common.c
setting-time/src/setting-time-main.c
smartmanager-battery/src/smartmanager-battery-main.c

index 0ee8b5c9f89a3e1b9097df0028fc67e606c7bfce..e7fc36450ece084e55890dc20e08df192a8f4331 100644 (file)
@@ -222,7 +222,9 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
                        SETTING_TRACE("Add 5Step Slider");
 
                        Evas_Object *layout = elm_layout_add(obj);
-                       set_layout_file(layout, EDJDIR"/setting-theme.edj", "font_slider");
+                       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
+                       set_layout_file(layout, path, "font_slider");
+                       free(path);
 
                        evas_object_size_hint_weight_set(layout,
                                        EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
index a457069874c1ea01e1c9ee69ef9ad137e4039c29..af9e3c4e2485e68632b73588fc4e1e81679a6efa 100644 (file)
@@ -181,7 +181,9 @@ static bool _setting_font_app_create(void *priv)
                return false;
        }
 
-       elm_theme_extension_add(NULL, EDJDIR"/font-slider.edj");
+       char *path = get_resource_path(EDJDIR"/font-slider.edj");
+       elm_theme_extension_add(NULL, path);
+       free(path);
 
        setting_create_Gendial_itc(SETTING_GENLIST_2LINE_STYLE,
                        &(ad->itc_2text_3_parent));
index b28cde6fed48ae5c3a8e657e78939b12e649e344..c8e3f3dfde3a1d546d4e768fc8c6dee2690011fd 100644 (file)
@@ -671,7 +671,9 @@ static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj,
        if (slider == NULL)
                return NULL;
 
-       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item");
+       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
+       set_layout_file(layout, path, "gl_custom_item");
+       free(path);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
                        EVAS_HINT_EXPAND);
index 04d38b12d407cfcd180b6628bfaecf9215ee5011..8429ba580eb8814264f277ee68712a3218ca23b3 100644 (file)
@@ -720,7 +720,9 @@ static Evas_Object *_add_datefield_new(Setting_GenGroupItem_Data *item_data,
        elm_box_padding_set(box1, ELM_SCALE_SIZE(15), ELM_SCALE_SIZE(5));
 
        Evas_Object *layout = elm_layout_add(box1);
-       set_layout_file(layout, EDJDIR"/setting-theme.edj", "date_time_layout");
+       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
+       set_layout_file(layout, path, "date_time_layout");
+       free(path);
 
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
index af9e3ec189cdd125e6d1b26ddc1a29786cadd1f1..42e662f1d31b97b235d9a32e1516d43b82bd9a72 100644 (file)
@@ -94,7 +94,9 @@ static Evas_Object *_itc_battery_info_content_get(
                progressbar_style = "custom_red";
 
        layout = elm_layout_add(obj);
-       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item_battery");
+       char *path = get_resource_path(EDJDIR"/setting-theme.edj");
+       set_layout_file(layout, path, "gl_custom_item_battery");
+       free(path);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
        progress = elm_progressbar_add(layout);