X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_timer.c;h=4d05d48d66a4284a91d73a3e2c1e81307285eea5;hp=05e259249310b26f13c845e8ce82b4cdcbbc31d4;hb=0f8d24c745efc1057f8d25ada1375c88a1ab2ed7;hpb=f42563c20bd3891040e3b18e66b723bb57d5eccf

diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 05e2592..4d05d48 100644
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_timer.c 279 2005-03-13 14:32:25Z tilman $
- *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
@@ -62,6 +60,15 @@ static void c_free (RbTimer *timer)
 	free (timer);
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+	RbTimer *timer = NULL;
+
+	ecore_init ();
+
+	return Data_Make_Struct (klass, RbTimer, c_mark, c_free, timer);
+}
+
 /*
  * call-seq:
  *  Ecore::Timer.new(interval) { block } => timer
@@ -70,25 +77,18 @@ static void c_free (RbTimer *timer)
  * When the timeout is hit, the block is called.
  * If the block returns false, the timer is deleted.
  */
-static VALUE c_new (VALUE klass, VALUE interval)
+static VALUE c_init (VALUE self, VALUE interval)
 {
-	VALUE self;
-	RbTimer *timer = NULL;
+	GET_OBJ (self, RbTimer, timer);
 
 	if (!rb_block_given_p ())
-		return Qnil;
-
-	self = Data_Make_Struct (klass, RbTimer, c_mark, c_free, timer);
-
-	ecore_init ();
+		rb_raise (rb_eStandardError, "block missing");
 
 	timer->callback = rb_block_proc ();
 	timer->deleted = false;
 	timer->real = ecore_timer_add (NUM2DBL (interval),
 	                               on_timer, timer);
 
-	rb_obj_call_init (self, 0, NULL);
-
 	return self;
 }
 
@@ -132,7 +132,8 @@ void Init_Timer (void)
 {
 	VALUE c = rb_define_class_under (mEcore, "Timer", rb_cObject);
 
-	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, 1);
 	rb_define_method (c, "delete", c_delete, 0);
 	rb_define_method (c, "deleted?", c_deleted_get, 0);
 	rb_define_method (c, "interval=", c_interval_set, 1);