fix more edje file set breaks

if group does change unloaidng first is bad because of the same
reasons - losing swallowed etc. content. so disable entirely.

1 files changed, 11 insertions, 15 deletions

diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c
index 1777912f49..674c7cd514 100644
--- a/src/lib/edje/edje_smart.c
+++ b/src/lib/edje/edje_smart.c
@@ -466,21 +466,17 @@ edje_object_mmap_set(Edje_Object *obj, const Eina_File *file, const char *group)
 EAPI Eina_Bool
 edje_object_file_set(Edje_Object *obj, const char *file, const char *group)
 {
-   const char *cur_file = efl_file_get(obj);
-   const char *cur_group = efl_file_key_get(obj);
-
-   if (!(((file) && (cur_file) && (!strcmp(cur_file, file))) &&
-         ((group) && (cur_group) && (!strcmp(cur_group, group)))))
-     {
-        // We can't blindly unload here - this loses swallowed content (in
-        // swallows, boxes, tables etc.) ... this here along with an actual
-        // implementation of file unload broke the pager in E for starters
-        // as shading then unshading (double click titlebar) a window would
-        // lose the mini preview image obj swallowed in. also fullscreening
-        // would do it. this also broke gadget bar, the xkb gadget in it too
-        // and more... so this is a particularly bad thing break
-        efl_file_unload(obj);
-     }
+   // We can't blindly unload here - this loses swallowed content (in
+   // swallows, boxes, tables etc.) ... this here along with an actual
+   // implementation of file unload broke the pager in E for starters
+   // as shading then unshading (double click titlebar) a window would
+   // lose the mini preview image obj swallowed in. also fullscreening
+   // would do it. this also broke gadget bar, the xkb gadget in it too
+   // and more... so this is a particularly bad thing break. we need to
+   // iterate over every child and re-swallow, re-pack into boxes, tables
+   // etc. because that is what edje used to do. unloading here is definitely
+   // worse ... so disable for now.
+   // efl_file_unload(obj);
    return efl_file_simple_load(obj, file, group);
 }