Fixed class instantiation.

[ruby-ecore.git] / src / ecore / rb_timer.c

diff --git a/src/ecore/rb_timer.c b/src/ecore/rb_timer.c
index 05e259249310b26f13c845e8ce82b4cdcbbc31d4..939a88d9df91c8a64a0f8e5790ad10b107255d31 100644 (file)
--- a/src/ecore/rb_timer.c
+++ b/src/ecore/rb_timer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_timer.c 279 2005-03-13 14:32:25Z tilman $
+ * $Id: rb_timer.c 351 2006-02-10 15:25:40Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -62,6 +62,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 +79,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 +134,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);