X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_idle_enterer.c;fp=src%2Fecore%2Frb_idle_enterer.c;h=236f891eab68be141d892698a9fbca69d8e80b52;hp=39bac7e18a4b3c287973e8612b698e39f85815fb;hb=fa957a85d2bac8f3ec0845737540254f25d6685c;hpb=abb800d76a0c982e0038289d4df96e357f791005

diff --git a/src/ecore/rb_idle_enterer.c b/src/ecore/rb_idle_enterer.c
index 39bac7e..236f891 100644
--- a/src/ecore/rb_idle_enterer.c
+++ b/src/ecore/rb_idle_enterer.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_idle_enterer.c 154 2004-12-09 18:49:18Z tilman $
+ * $Id: rb_idle_enterer.c 351 2006-02-10 15:25:40Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -62,6 +62,16 @@ static void c_free (RbIdleEnterer *idle_enterer)
 	free (idle_enterer);
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+	RbIdleEnterer *idle_enterer;
+
+	ecore_init ();
+
+	return Data_Make_Struct (klass, RbIdleEnterer, c_mark, c_free,
+	                         idle_enterer);
+}
+
 /*
  * call-seq:
  *  Ecore::IdleEnterer.new { block } => idle_enterer
@@ -70,26 +80,18 @@ static void c_free (RbIdleEnterer *idle_enterer)
  * When Ecore enters the idle state, the specified block will be called.
  * If the block returns false, the IdleEnterer is deleted.
  */
-static VALUE c_new (VALUE klass)
+static VALUE c_init (VALUE self)
 {
-	VALUE self;
-	RbIdleEnterer *idle_enterer;
+	GET_OBJ (self, RbIdleEnterer, idle_enterer);
 
 	if (!rb_block_given_p ())
-		return Qnil;
-
-	self = Data_Make_Struct (klass, RbIdleEnterer, c_mark, c_free,
-	                         idle_enterer);
-
-	ecore_init ();
+		rb_raise (rb_eStandardError, "block missing");
 
 	idle_enterer->callback = rb_block_proc ();
 	idle_enterer->deleted = false;
 	idle_enterer->real = ecore_idle_enterer_add (on_idle_enter,
 	                                             idle_enterer);
 
-	rb_obj_call_init (self, 0, NULL);
-
 	return self;
 }
 
@@ -117,6 +119,7 @@ void Init_IdleEnterer (void)
 {
 	VALUE c = rb_define_class_under (mEcore, "IdleEnterer", rb_cObject);
 
-	rb_define_singleton_method (c, "new", c_new, 0);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, 0);
 	rb_define_method (c, "delete", c_delete, 0);
 }