X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_idler.c;h=ce6bc03817828da9f55585eb9517ad22adfa1b72;hb=4f5c88b4cfae4d5fb177710b09624f2e229d6a1b;hp=5552fe2452ffa9b0e365e0bc26bdfc22095cc26b;hpb=627a83d5b49b1abd92bd73a10a56042a6d202dfa;p=ruby-ecore.git

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 5552fe2..ce6bc03 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_idler.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;
 } RbEcoreIdler;
 
-VALUE cIdler;
-
 static int on_idler (void *data)
 {
 	VALUE r;
@@ -49,23 +47,13 @@ static int on_idler (void *data)
 	return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self)
-{
-	RbEcoreIdler *idler = NULL;
-
-	Data_Get_Struct (self, RbEcoreIdler, idler);
-
-	idler->cb = (void *) rb_block_proc ();
-	idler->idler = ecore_idler_add (on_idler, idler);
-
-	return self;
-}
-
 static void c_free (RbEcoreIdler *idler)
 {
 	if (idler->idler && !idler->deleted)
 		ecore_idler_del (idler->idler);
 
+	ecore_shutdown ();
+
 	free (idler);
 }
 
@@ -74,8 +62,16 @@ static VALUE c_new (VALUE klass)
 	VALUE self;
 	RbEcoreIdler *idler;
 
+	if (!rb_block_given_p ())
+		return Qnil;
+
 	self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
 
+	ecore_init ();
+
+	idler->cb = (void *) rb_block_proc ();
+	idler->idler = ecore_idler_add (on_idler, idler);
+
 	rb_obj_call_init (self, 0, NULL);
 
 	return self;
@@ -99,10 +95,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Idler (void)
 {
-	cIdler = rb_define_class_under (mEcore, "Idler", rb_cObject);
+	VALUE c = rb_define_class_under (mEcore, "Idler", rb_cObject);
 
-	rb_define_singleton_method (cIdler, "new", c_new, 1);
-	rb_define_method (cIdler, "initialize", c_init, 1);
-	rb_define_method (cIdler, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-