X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_job%2Frb_job.c;h=d4348cffb0660f8c6ebb598eaddd0f8e6583e960;hb=f805cf241a9d1fb9765892f0af48ede8359e9b65;hp=7db2f687a926d31754386a37e7ee2ca83b7c70a6;hpb=627a83d5b49b1abd92bd73a10a56042a6d202dfa;p=ruby-ecore.git

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 7db2f68..d4348cf 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: rb_job.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,43 +20,37 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Job.h>
 #include <stdbool.h>
 
 #include "rb_ecore_job.h"
 
 typedef struct {
-	Ecore_Job *job;
-	void *cb;
+	Ecore_Job *real;
+	VALUE callback;
 	bool deleted;
-} RbEcoreJob;
-
-VALUE cEcoreJob;
+} RbJob;
 
 static void on_job (void *data)
 {
-	RbEcoreJob *job = data;
+	RbJob *job = data;
 
-	rb_funcall ((VALUE) job->cb, rb_intern ("call"), 0);
+	rb_funcall (job->callback, rb_intern ("call"), 0);
 	job->deleted = true;
 }
 
-static VALUE c_init (VALUE self)
+static void c_mark (RbJob *job)
 {
-	RbEcoreJob *job = NULL;
-
-	Data_Get_Struct (self, RbEcoreJob, job);
-
-	job->cb = (void *) rb_block_proc ();
-	job->job = ecore_job_add (on_job, job);
-
-	return self;
+	rb_gc_mark (job->callback);
 }
 
-static void c_free (RbEcoreJob *job)
+static void c_free (RbJob *job)
 {
-	if (job->job && !job->deleted)
-		ecore_job_del (job->job);
+	if (job->real && !job->deleted)
+		ecore_job_del (job->real);
+
+	ecore_shutdown ();
 
 	free (job);
 }
@@ -64,9 +58,17 @@ static void c_free (RbEcoreJob *job)
 static VALUE c_new (VALUE klass)
 {
 	VALUE self;
-	RbEcoreJob *job;
+	RbJob *job;
+
+	if (!rb_block_given_p ())
+		return Qnil;
+
+	self = Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
 
-	self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
+	ecore_init ();
+
+	job->callback = rb_block_proc ();
+	job->real = ecore_job_add (on_job, job);
 
 	rb_obj_call_init (self, 0, NULL);
 
@@ -76,14 +78,14 @@ static VALUE c_new (VALUE klass)
 static VALUE c_delete (VALUE self)
 {
 	VALUE ret = Qfalse;
-	RbEcoreJob *job = NULL;
+	RbJob *job = NULL;
 
-	Data_Get_Struct (self, RbEcoreJob, job);
+	Data_Get_Struct (self, RbJob, job);
 
-	if (job->job && !job->deleted) {
-		ecore_job_del (job->job);
+	if (job->real && !job->deleted) {
+		ecore_job_del (job->real);
 		job->deleted = true;
-		job->job = NULL;
+		job->real = NULL;
 		ret = Qtrue;
 	}
 
@@ -92,10 +94,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-	cEcoreJob = rb_define_class_under (mJob, "Job", rb_cObject);
+	VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-	rb_define_singleton_method (cEcoreJob, "new", c_new, 0);
-	rb_define_method (cEcoreJob, "initialize", c_init, 0);
-	rb_define_method (cEcoreJob, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 0);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-