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

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 5552fe2..b890ef5 100644
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_idler.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -19,26 +19,24 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Ecore.h>
-#include <stdbool.h>
 
 #include "rb_ecore.h"
 
 typedef struct {
-	Ecore_Idler *idler;
-	void *cb;
+	Ecore_Idler *real;
+	VALUE callback;
 	bool deleted;
-} RbEcoreIdler;
-
-VALUE cIdler;
+} RbIdler;
 
 static int on_idler (void *data)
 {
 	VALUE r;
-	RbEcoreIdler *idler = data;
+	RbIdler *idler = data;
 
-	r = rb_funcall ((VALUE) idler->cb, rb_intern ("call"), 0);
+	r = rb_funcall (idler->callback, rb_intern ("call"), 0);
 
 	/* if the callback returns false, we return 0 and Ecore
 	 * will remove the idler
@@ -49,22 +47,17 @@ static int on_idler (void *data)
 	return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self)
+static void c_mark (RbIdler *idler)
 {
-	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;
+	rb_gc_mark (idler->callback);
 }
 
-static void c_free (RbEcoreIdler *idler)
+static void c_free (RbIdler *idler)
 {
-	if (idler->idler && !idler->deleted)
-		ecore_idler_del (idler->idler);
+	if (idler->real && !idler->deleted)
+		ecore_idler_del (idler->real);
+
+	ecore_shutdown ();
 
 	free (idler);
 }
@@ -72,9 +65,17 @@ static void c_free (RbEcoreIdler *idler)
 static VALUE c_new (VALUE klass)
 {
 	VALUE self;
-	RbEcoreIdler *idler;
+	RbIdler *idler;
+
+	if (!rb_block_given_p ())
+		return Qnil;
+
+	self = Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
 
-	self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
+	ecore_init ();
+
+	idler->callback = rb_block_proc ();
+	idler->real = ecore_idler_add (on_idler, idler);
 
 	rb_obj_call_init (self, 0, NULL);
 
@@ -83,13 +84,11 @@ static VALUE c_new (VALUE klass)
 
 static VALUE c_delete (VALUE self)
 {
-	RbEcoreIdler *idler = NULL;
-
-	Data_Get_Struct (self, RbEcoreIdler, idler);
+	GET_OBJ (self, RbIdler, idler);
 
-	if (idler->idler && !idler->deleted) {
-		ecore_idler_del (idler->idler);
-		idler->idler = NULL;
+	if (idler->real && !idler->deleted) {
+		ecore_idler_del (idler->real);
+		idler->real = NULL;
 		idler->deleted = true;
 	} else
 		rb_raise (rb_eException, "Idler already deleted!");
@@ -99,10 +98,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);
 }
-