Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_var.c
Log Message:
fixed timer/animator mixup
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_var.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_var.c 13 Oct 2004 18:56:48 -0000 1.9
+++ edje_var.c 29 Oct 2004 16:28:42 -0000 1.10
@@ -4,7 +4,7 @@
static int _edje_var_timer_cb(void *data);
static int _edje_var_anim_cb(void *data);
-static Ecore_Timer *_edje_anim_timer = NULL;
+static Ecore_Animator *_edje_animator = NULL;
static Evas_List *_edje_anim_list = NULL;
static int
@@ -118,13 +118,13 @@
}
if (!_edje_anim_list)
{
- if (_edje_anim_timer)
+ if (_edje_animator)
{
- ecore_timer_del(_edje_anim_timer);
- _edje_anim_timer = NULL;
+ ecore_animator_del(_edje_animator);
+ _edje_animator = NULL;
}
}
- if (_edje_anim_timer) return 1;
+ if (_edje_animator) return 1;
return 0;
}
@@ -205,10 +205,10 @@
_edje_anim_list = evas_list_remove(_edje_anim_list, ed);
if (!_edje_anim_list)
{
- if (_edje_anim_timer)
+ if (_edje_animator)
{
- ecore_timer_del(_edje_anim_timer);
- _edje_anim_timer = NULL;
+ ecore_animator_del(_edje_animator);
+ _edje_animator = NULL;
}
}
}
@@ -993,8 +993,8 @@
if (!_edje_anim_list)
_edje_anim_list = evas_list_append(_edje_anim_list, ed);
ed->var_pool->animators = evas_list_prepend(ed->var_pool->animators, ea);
- if (!_edje_anim_timer)
- _edje_anim_timer = ecore_animator_add(_edje_var_anim_cb, NULL);
+ if (!_edje_animator)
+ _edje_animator = ecore_animator_add(_edje_var_anim_cb, NULL);
return ea->id;
}
@@ -1020,10 +1020,10 @@
_edje_anim_list = evas_list_remove(_edje_anim_list, ed);
if (!_edje_anim_list)
{
- if (_edje_anim_timer)
+ if (_edje_animator)
{
- ecore_timer_del(_edje_anim_timer);
- _edje_anim_timer = NULL;
+ ecore_animator_del(_edje_animator);
+ _edje_animator = NULL;
}
}
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
