aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/evas/src/lib/canvas/evas_main.c
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2008-10-17 11:23:18 +0000
committerCedric BAIL <cedric.bail@free.fr>2008-10-17 11:23:18 +0000
commitc99824328fd5962ad1a53b09c687fe158f0166dd (patch)
tree8c6c349998a7a109c8a0d70b3f4cb2e40314ae99 /legacy/evas/src/lib/canvas/evas_main.c
parentadd prototype. (diff)
downloadefl-c99824328fd5962ad1a53b09c687fe158f0166dd.tar.gz
Move from Evas_Object_List to Eina_Inlist and completly remove Evas_Object_List.
SVN revision: 36750
Diffstat (limited to 'legacy/evas/src/lib/canvas/evas_main.c')
-rw-r--r--legacy/evas/src/lib/canvas/evas_main.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 6c855b7061..eeb576a920 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -93,7 +93,7 @@ evas_new(void)
EAPI void
evas_free(Evas *e)
{
- Evas_Object_List *l;
+ Evas_Layer *lay;
int i;
int del;
@@ -110,18 +110,14 @@ evas_free(Evas *e)
while (del)
{
del = 0;
- for (l = (Evas_Object_List *)(e->layers); l; l = l->next)
+ EINA_INLIST_ITER_NEXT(e->layers, lay)
{
- Evas_Layer *lay;
- Evas_Object_List *ll;
+ Evas_Object *o;
- lay = (Evas_Layer *)l;
evas_layer_pre_free(lay);
- for (ll = (Evas_Object_List *)lay->objects; ll; ll = ll->next)
- {
- Evas_Object *o;
- o = (Evas_Object *)ll;
+ EINA_INLIST_ITER_NEXT(lay->objects, o)
+ {
if ((o->callbacks) && (o->callbacks->walking_list))
{
/* Defer free */
@@ -136,14 +132,12 @@ evas_free(Evas *e)
}
while (e->layers)
{
- Evas_Layer *lay;
-
lay = e->layers;
evas_layer_del(lay);
evas_layer_free(lay);
}
e->walking_list--;
-
+
evas_font_path_clear(e);
e->pointer.object.in = evas_list_free(e->pointer.object.in);