X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_idler.c;h=746229050c055168531666b11b332d76a42507a0;hb=fa957a85d2bac8f3ec0845737540254f25d6685c;hp=b890ef59a49b5726523e610a134c68ee03c33524;hpb=f805cf241a9d1fb9765892f0af48ede8359e9b65;p=ruby-ecore.git

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index b890ef5..7462290 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,7 +1,7 @@
 /*
- * $Id: rb_idler.c 50 2004-08-01 10:18:39Z tilman $
+ * $Id: rb_idler.c 351 2006-02-10 15:25:40Z tilman $
  *
- * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
+ * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -62,26 +62,43 @@ static void c_free (RbIdler *idler)
 	free (idler);
 }
 
-static VALUE c_new (VALUE klass)
+static VALUE c_alloc (VALUE klass)
 {
-	VALUE self;
 	RbIdler *idler;
 
-	if (!rb_block_given_p ())
-		return Qnil;
+	ecore_init ();
 
-	self = Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
+	return Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
+}
 
-	ecore_init ();
+/*
+ * call-seq:
+ *  Ecore::Idler.new { block } => idler
+ *
+ * Creates an Ecore::Idler object.
+ * When Ecore is idle, the specified block will be called.
+ * If the block returns false, the idler is deleted.
+ */
+static VALUE c_init (VALUE self)
+{
+	GET_OBJ (self, RbIdler, idler);
+
+	if (!rb_block_given_p ())
+		rb_raise (rb_eStandardError, "block missing");
 
 	idler->callback = rb_block_proc ();
+	idler->deleted = false;
 	idler->real = ecore_idler_add (on_idler, idler);
 
-	rb_obj_call_init (self, 0, NULL);
-
 	return self;
 }
 
+/*
+ * call-seq:
+ *  idler.delete => nil
+ *
+ * Deletes <i>idler</i>.
+ */
 static VALUE c_delete (VALUE self)
 {
 	GET_OBJ (self, RbIdler, idler);
@@ -100,6 +117,7 @@ void Init_Idler (void)
 {
 	VALUE c = rb_define_class_under (mEcore, "Idler", 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, 0);
 	rb_define_method (c, "delete", c_delete, 0);
 }