From 4ca3ef45146e05908a13d1010909abeba9693ad6 Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Mon, 29 Jun 2015 10:57:40 +0530 Subject: [PATCH] Revert "theme: return false if elm_object_style_set() failed to set requested style." This reverts commit 76004dfbec84664e253babc5bf576398a5901395. We need to change other code also to accommodate this change. _elm_theme_set should return an enum which tells what failed. enum { THEME_APPLY_FAILED, THEME_DEFAULT_SUCCESS. THEME_APPLY_SUCCESS }; Based on that, we decide what needs to be done. The above code will break the layout theme if incorrect theme are passed. It should be backported to Elm 1.14. @fix --- legacy/elementary/src/lib/elm_theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/elementary/src/lib/elm_theme.c b/legacy/elementary/src/lib/elm_theme.c index 1e9a9b0485..58b7514c0d 100644 --- a/legacy/elementary/src/lib/elm_theme.c +++ b/legacy/elementary/src/lib/elm_theme.c @@ -319,7 +319,7 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou file = _elm_theme_group_file_find(th, buf2); if (file) { - if (edje_object_mmap_set(o, file, buf2)) return EINA_FALSE; + if (edje_object_mmap_set(o, file, buf2)) return EINA_TRUE; else { DBG("could not set theme group '%s' from file '%s': %s",