Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_container.c 


Log Message:
On a container remove, just remove the child from whatever parent container
its in. Checking parent heirarchy can cause issues with containers with
complex redirection.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_container.c     17 Feb 2006 06:43:33 -0000      1.37
+++ ewl_container.c     18 Feb 2006 06:39:35 -0000      1.38
@@ -355,25 +355,19 @@
        if (child == EWL_WIDGET(pc->redirect))
                pc->redirect = NULL;
 
-       if (child->parent != EWL_WIDGET(pc)) {
-               while (pc->redirect)
-                       pc = pc->redirect;
-       }
-
-       if (!pc->children)
-               DRETURN(DLEVEL_STABLE);
-
        /*
         * First remove reference to the parent if necessary.
         * Bail out after setting the parent as that will get us back here
         * with a NULL parent on the widget.
-        *
         */
-       if (EWL_CONTAINER(child->parent) == pc) {
+       if (child->parent) {
                ewl_widget_parent_set(child, NULL);
                DRETURN(DLEVEL_STABLE);
        }
 
+       if (!pc->children)
+               DRETURN(DLEVEL_STABLE);
+
        /*
         * Traverse the list to the child.
         */




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to