X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_timer.c;h=543a5415f6dcc2c3ad2a423dce81ec361b8d04b1;hb=4f5c88b4cfae4d5fb177710b09624f2e229d6a1b;hp=28bb4057b611b2d20b064be53e9733ac7cbb3309;hpb=627a83d5b49b1abd92bd73a10a56042a6d202dfa;p=ruby-ecore.git

diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 28bb405..543a541 100644
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_timer.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,6 @@ typedef struct {
 	bool deleted;
 } RbEcoreTimer;
 
-VALUE cTimer;
-
 static int on_timer (void *data)
 {
 	VALUE r;
@@ -49,36 +47,33 @@ static int on_timer (void *data)
 	return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self, VALUE interval)
-{
-	RbEcoreTimer *timer = NULL;
-
-	Data_Get_Struct (self, RbEcoreTimer, timer);
-
-	timer->cb = (void *) rb_block_proc ();
-	timer->timer = ecore_timer_add (NUM2DBL (interval),
-	                                on_timer, timer);
-
-	return self;
-}
-
 static void c_free (RbEcoreTimer *timer)
 {
 	if (timer->timer && !timer->deleted)
 		ecore_timer_del (timer->timer);
 
+	ecore_shutdown ();
+
 	free (timer);
 }
 
 static VALUE c_new (VALUE klass, VALUE interval)
 {
-	VALUE self, argv[1];
+	VALUE self;
 	RbEcoreTimer *timer;
 
+	if (!rb_block_given_p ())
+		return Qnil;
+
 	self = Data_Make_Struct (klass, RbEcoreTimer, NULL, c_free, timer);
 
-	argv[0] = interval;
-	rb_obj_call_init (self, 1, argv);
+	ecore_init ();
+
+	timer->cb = (void *) rb_block_proc ();
+	timer->timer = ecore_timer_add (NUM2DBL (interval),
+	                                on_timer, timer);
+
+	rb_obj_call_init (self, 0, NULL);
 
 	return self;
 }
@@ -101,10 +96,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Timer (void)
 {
-	cTimer = rb_define_class_under (mEcore, "Timer", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
 
-	rb_define_singleton_method (cTimer, "new", c_new, 1);
-	rb_define_method (cTimer, "initialize", c_init, 1);
-	rb_define_method (cTimer, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-