X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_job%2Frb_job.c;h=0ef669be9d91b53a4b5ada85d2ce7fb529190f5c;hb=094fc971409b22abd413ed08935786dba73a9062;hp=255c1d6527ff7939f2607e00ad8b5209469ea356;hpb=f3e4005cf0cfdefa25cfd5187a67a4f456fe697f;p=ruby-ecore.git

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 255c1d6..0ef669b 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_job.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,6 +20,7 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Job.h>
 #include <stdbool.h>
 
@@ -31,8 +32,6 @@ typedef struct {
 	bool deleted;
 } RbEcoreJob;
 
-static VALUE cJob;
-
 static void on_job (void *data)
 {
 	RbEcoreJob *job = data;
@@ -41,23 +40,13 @@ static void on_job (void *data)
 	job->deleted = true;
 }
 
-static VALUE c_init (VALUE self)
-{
-	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;
-}
-
 static void c_free (RbEcoreJob *job)
 {
 	if (job->job && !job->deleted)
 		ecore_job_del (job->job);
 
+	ecore_shutdown ();
+
 	free (job);
 }
 
@@ -66,8 +55,16 @@ static VALUE c_new (VALUE klass)
 	VALUE self;
 	RbEcoreJob *job;
 
+	if (!rb_block_given_p ())
+		return Qnil;
+
 	self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
 
+	ecore_init ();
+
+	job->cb = (void *) rb_block_proc ();
+	job->job = ecore_job_add (on_job, job);
+
 	rb_obj_call_init (self, 0, NULL);
 
 	return self;
@@ -92,10 +89,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-	cJob = rb_define_class_under (mJob, "Job", rb_cObject);
+	VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-	rb_define_singleton_method (cJob, "new", c_new, 0);
-	rb_define_method (cJob, "initialize", c_init, 0);
-	rb_define_method (cJob, "delete", c_delete, 0);
+	rb_define_singleton_method (c, "new", c_new, 0);
+	rb_define_method (c, "delete", c_delete, 0);
 }
-