X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_job%2Frb_job.c;h=5c4ff46c00cc55620c414ac9abacb77b28c8ce95;hp=71fe1e3143308f28ed545fc34396b65c6f0c3447;hb=d907bd016f15dc5be72d12ee1742047eafc2abae;hpb=0ad70bf579b712a8bf770e2775cffa4a50097557

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 71fe1e3..5c4ff46 100644
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 77 2004-08-19 17:39:29Z tilman $
+ * $Id: rb_job.c 351 2006-02-10 15:25:40Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -55,6 +55,15 @@ static void c_free (RbJob *job)
 	free (job);
 }
 
+static VALUE c_alloc (VALUE klass)
+{
+	RbJob *job = NULL;
+
+	ecore_init ();
+
+	return Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
+}
+
 /*
  * call-seq:
  *  Ecore::Job::Job.new { block } => job
@@ -62,24 +71,19 @@ static void c_free (RbJob *job)
  * Creates an Ecore::Job::Job object.
  * After execution, the object will be deleted.
  */
-static VALUE c_new (VALUE klass)
+static VALUE c_init (VALUE self)
 {
-	VALUE self;
-	RbJob *job;
+	RbJob *job = NULL;
 
 	if (!rb_block_given_p ())
-		return Qnil;
-
-	self = Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
+		rb_raise (rb_eStandardError, "block missing");
 
-	ecore_init ();
+	Data_Get_Struct (self, RbJob, job);
 
 	job->callback = rb_block_proc ();
 	job->deleted = false;
 	job->real = ecore_job_add (on_job, job);
 
-	rb_obj_call_init (self, 0, NULL);
-
 	return self;
 }
 
@@ -110,6 +114,7 @@ void Init_Job (void)
 {
 	VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-	rb_define_singleton_method (c, "new", c_new, 0);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, 0);
 	rb_define_method (c, "delete", c_delete, 0);
 }