X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_job%2Frb_job.c;h=e0b1691054f4dcc2ab36ec5855cadc6cd0c53e3d;hb=98ce45a70b8b219b738bb804297417aae0ae9baa;hp=4d45b1a781ab5cbc18c398429ead76de5237f85e;hpb=f007c429dfb7b76be36317212a0585401e13984a;p=ruby-ecore.git

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 4d45b1a..e0b1691 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_job.c 27 2004-07-08 18:25:05Z 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,7 +32,7 @@ typedef struct {
 	bool deleted;
 } RbEcoreJob;
 
-VALUE cEcoreJob;
+static VALUE cJob;
 
 static void on_job (void *data)
 {
@@ -41,23 +42,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 +57,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 +91,9 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-	cEcoreJob = rb_define_class_under (mJob, "Job", rb_cObject);
+	cJob = 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 (cJob, "new", c_new, 0);
+	rb_define_method (cJob, "delete", c_delete, 0);
 }