Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_timer.c
Log Message:
delete timer on 0 return AND if manually deleted prefer the delete over the
continue return of 1
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_timer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore_timer.c 30 Aug 2005 10:05:26 -0000 1.13
+++ ecore_timer.c 11 Dec 2005 14:33:21 -0000 1.14
@@ -181,10 +181,15 @@
* assume that the system hung and set the timer to go off
* timer->in from now.
*/
- if ((timer->at + timer->in) < (when - 30.0))
- _ecore_timer_set(timer, when + timer->in, timer->in,
timer->func, timer->data);
+ if (!timer->delete_me)
+ {
+ if ((timer->at + timer->in) < (when - 30.0))
+ _ecore_timer_set(timer, when + timer->in, timer->in,
timer->func, timer->data);
+ else
+ _ecore_timer_set(timer, timer->at + timer->in,
timer->in, timer->func, timer->data);
+ }
else
- _ecore_timer_set(timer, timer->at + timer->in, timer->in,
timer->func, timer->data);
+ free(timer);
}
else
free(timer);
-------------------------------------------------------
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://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
