Revert "elm: disable interface theme loading"

This reverts commit 3d07b90461818804ed51b6dcaed9f05c0d0155bb.

Some commits should address the issues mentioned in T6579
  959571b9955babc40367cf3a634dddba7a7cdcc2
  fe346d2ee23eb0d9fca0544f6732c709ec3a4b8b

But to be honest I am still not sure exactly what the issue was?

Ref T6579

diff --git a/src/lib/elementary/elm_theme.c b/src/lib/elementary/elm_theme.c
index 6de5706..0b24f40 100644 (file)
--- 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);