From 5935088dbee26d187d82fd2383002ad062d89536 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 5 Jan 2018 11:43:47 -0500 Subject: [PATCH] elm: disable interface theme loading this is broken. do not reenable until testing has been done. partially reverts dd4467505ea29d6120e5e7d467d76836a6630ff4 ref T6579 --- src/lib/elementary/elm_theme.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c index 69028c6..0780265 100644 --- a/src/lib/elementary/elm_theme.c +++ b/src/lib/elementary/elm_theme.c @@ -305,12 +305,12 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou if ((!clas) || !o) return EFL_UI_THEME_APPLY_FAILED; if (!th) th = &(theme_default); - if (is_legacy) + //if (is_legacy) snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", (style) ? style : "default"); - else - snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas, - ((group) ? group_sep : "\0"), ((group) ? group : "\0"), - ((style) ? style_sep : "\0"), ((style) ? style : "\0")); + //else + //snprintf(buf2, sizeof(buf2), "efl/%s%s%s%s%s", clas, + //((group) ? group_sep : "\0"), ((group) ? group : "\0"), + //((style) ? style_sep : "\0"), ((style) ? style : "\0")); if (!eina_hash_find(th->cache_style_load_failed, buf2)) { file = _elm_theme_group_file_find(th, buf2); @@ -333,11 +333,11 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou return EFL_UI_THEME_APPLY_FAILED; // Use the elementary default style. - if (is_legacy) + //if (is_legacy) snprintf(buf2, sizeof(buf2), "elm/%s/%s/%s", clas, (group) ? group : "base", "default"); - else - snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas, - ((group) ? group_sep : "\0"), ((group) ? group : "\0")); + //else + //snprintf(buf2, sizeof(buf2), "efl/%s%s%s", clas, + //((group) ? group_sep : "\0"), ((group) ? group : "\0")); if (!eina_hash_find(th->cache_style_load_failed, buf2)) { file = _elm_theme_group_file_find(th, buf2); -- 2.7.4