Fixed paths in layout loading

Change-Id: I7e09d229d4edf001cd5c950808faf64c5aaa5f15
Signed-off-by: Michal Skorupinski <m.skorupinsk@samsung.com>

diff --git a/setting-common/inc/setting-common-general-func.h b/setting-common/inc/setting-common-general-func.h
index fb21ee06dc5d2c80cd3a8e90756ad925bc052a20..cc5c4d6c8dbe69a49e9b7ef7c78d8c4d2e93d918 100755 (executable)
--- a/setting-common/inc/setting-common-general-func.h
+++ b/setting-common/inc/setting-common-general-func.h
@@ -76,6 +76,6 @@ char *get_resource_path(const char *name);
 char *get_data_path(char *name);
 char *get_shared_path(char *name);
 char *get_globaluser_data(char *name);
-void set_layout_file(Evas_Object *layout, char *name, char *group);
+bool set_layout_file(Evas_Object *layout, char *name, char *group);
 
 #endif                         /* __SETTING_COMMON_GENERAL_FUNC_H__ */

diff --git a/setting-common/src/setting-common-general-func.c b/setting-common/src/setting-common-general-func.c
index 68e0c9412d119313b8ffabcd303feac5691c7e9c..4ffe7b41bb95c3bc0d2a7740ea32bad505f38f09 100755 (executable)
--- a/setting-common/src/setting-common-general-func.c
+++ b/setting-common/src/setting-common-general-func.c
@@ -1010,13 +1010,15 @@ char *get_shared_path(char *name)
 }
 
 EXPORT_PUBLIC
-void set_layout_file(Evas_Object *layout, char *name, char *group)
+bool set_layout_file(Evas_Object *layout, char *name, char *group)
 {
        char *path = get_resource_path(name);
        bool ret = elm_layout_file_set(layout, path, group);
+       free(path);
        if (!ret) {
                SETTING_TRACE_ERROR("Failed to load edj file. Name: %s, group: %s", name, group);
+               return false;
        }
 
-       free(path);
+       return true;
 }

diff --git a/setting-connectivity/src/setting-connectivity-usb.c b/setting-connectivity/src/setting-connectivity-usb.c
index ff1eb11388a6686cc9d57b765b7f3786662233b9..d95e12a23d6551b5b50df2bc86dc4ffedae9a4b4 100755 (executable)
--- a/setting-connectivity/src/setting-connectivity-usb.c
+++ b/setting-connectivity/src/setting-connectivity-usb.c
@@ -502,8 +502,7 @@ static int _view_create(void *cb)
        if (ret != SETTING_RETURN_SUCCESS)
                return ret;
 
-       elm_layout_file_set(ad->md.layout, SETTING_THEME_EDJ_NAME,
-                       "selinfo_bottom");
+       set_layout_file(ad->md.layout, SETTING_THEME_EDJ_NAME, "selinfo_bottom");
        evas_object_size_hint_weight_set(ad->md.layout, EVAS_HINT_EXPAND,
                        0.0);
 

diff --git a/setting-font/src/setting-font-main.c b/setting-font/src/setting-font-main.c
index a108724010d16ee92835ee2111913c502c536b8d..0353033608b1cbba089903d9837b58210cf9547a 100755 (executable)
--- a/setting-font/src/setting-font-main.c
+++ b/setting-font/src/setting-font-main.c
@@ -222,9 +222,7 @@ static Evas_Object *_font_size_slider_get(void *data, Evas_Object *obj,
                        SETTING_TRACE("Add 5Step Slider");
 
                        Evas_Object *layout = elm_layout_add(obj);
-                       bool ret = elm_layout_file_set(layout,
-                                       EDJDIR"/setting-theme.edj",
-                                       "font_slider");
+                       bool ret = set_layout_file(layout, EDJDIR"/setting-theme.edj", "font_slider");
                        if (ret == EINA_TRUE) { /* error condition */
                                SETTING_TRACE("elm_layout_file_set - OK");
                        } else {

diff --git a/setting-profile-common/src/setting-profile-common.c b/setting-profile-common/src/setting-profile-common.c
index 52661f79d0383ad042049de03beacc90e42d9ff5..4474eb2094fe88e688b9cf7ca202e8c1ce87ce11 100644 (file)
--- a/setting-profile-common/src/setting-profile-common.c
+++ b/setting-profile-common/src/setting-profile-common.c
@@ -675,8 +675,7 @@ static Evas_Object *__sound_slider_icon_get(void *data, Evas_Object *obj,
        if (slider == NULL)
                return NULL;
 
-       elm_layout_file_set(layout, EDJDIR"/setting-theme.edj",
-                                               "gl_custom_item");
+       set_layout_file(layout, EDJDIR"/setting-theme.edj", "gl_custom_item");
        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);