Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_notebook2.c
Log Message:
- move the check to see if the parent container is deleted into the
container code so it works in the general case
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_container.c 30 Jan 2006 22:33:45 -0000 1.28
+++ ewl_container.c 3 Feb 2006 19:17:52 -0000 1.29
@@ -928,6 +928,12 @@
DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
+ /* do nothing if the container is being destroyed */
+ if (ewl_object_queued_has(EWL_OBJECT(c), EWL_FLAG_QUEUED_DPROCESS)
+ || ewl_object_queued_has(EWL_OBJECT(c),
+ EWL_FLAG_QUEUED_DSCHEDULED))
+ DRETURN(DLEVEL_STABLE);
+
if (c->child_remove)
c->child_remove(c, w);
@@ -978,7 +984,10 @@
DCHECK_TYPE("c", c, EWL_CONTAINER_TYPE);
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
- if (ewl_object_queued_has(EWL_OBJECT(c), EWL_FLAG_QUEUED_DSCHEDULED))
+ /* do nothing if the container is being destroyed */
+ if (ewl_object_queued_has(EWL_OBJECT(c), EWL_FLAG_QUEUED_DPROCESS)
+ || ewl_object_queued_has(EWL_OBJECT(c),
+ EWL_FLAG_QUEUED_DSCHEDULED))
DRETURN(DLEVEL_STABLE);
if (c->child_hide)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_notebook2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_notebook2.c 3 Feb 2006 18:57:48 -0000 1.6
+++ ewl_notebook2.c 3 Feb 2006 19:17:53 -0000 1.7
@@ -489,14 +489,6 @@
n = EWL_NOTEBOOK2(EWL_WIDGET(c)->parent);
- /* do nothing if the notebook is being destroyed */
- if ((ewl_object_flags_has(EWL_OBJECT(n), EWL_FLAG_QUEUED_DPROCESS,
- EWL_FLAGS_QUEUED_MASK))
- || (ewl_object_flags_has(EWL_OBJECT(n),
- EWL_FLAG_QUEUED_DSCHEDULED,
- EWL_FLAGS_QUEUED_MASK)))
- DRETURN(DLEVEL_STABLE);
-
/* we still have a tab, delete it */
t = ewl_attach_notebook_data_get(w);
if (t)
-------------------------------------------------------
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
