Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c
Log Message:
Make sure loop quits.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_container.c 15 Feb 2005 13:17:53 -0000 1.28
+++ e_container.c 16 Feb 2005 11:23:56 -0000 1.29
@@ -394,11 +394,22 @@
static void
_e_container_free(E_Container *con)
{
+ Evas_List *l, *tmp;
if (con->gadman) e_object_del(E_OBJECT(con->gadman));
/* We can't use e_object_del here, because border adds a ref to itself
* when it is removed, and the ref is never unref'ed */
- while (con->clients) e_object_free(E_OBJECT(con->clients->data));
- while (con->zones) e_object_del(E_OBJECT(con->zones->data));
+ for (l = con->clients; l;)
+ {
+ tmp = l;
+ l = l->next;
+ e_object_free(E_OBJECT(tmp->data));
+ }
+ for (l = con->zones; l;)
+ {
+ tmp = l;
+ l = l->next;
+ e_object_del(E_OBJECT(tmp->data));
+ }
con->manager->containers = evas_list_remove(con->manager->containers, con);
e_canvas_del(con->bg_ecore_evas);
ecore_evas_free(con->bg_ecore_evas);
@@ -430,15 +441,12 @@
static void
_e_container_shape_free(E_Container_Shape *es)
{
+ Evas_List *l;
+
es->con->shapes = evas_list_remove(es->con->shapes, es);
- while (es->shape)
- {
- E_Rect *r;
-
- r = es->shape->data;
- es->shape = evas_list_remove_list(es->shape, es->shape);
- free(r);
- }
+ for (l = es->shape; l; l = l->next)
+ free(l->data);
+ evas_list_free(es->shape);
free(es);
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs