We now use real structs to wrap objects.

[ruby-ecore.git] / src / ecore_job / rb_job.c

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 0ef669be9d91b53a4b5ada85d2ce7fb529190f5c..d4348cffb0660f8c6ebb598eaddd0f8e6583e960 100644 (file)
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_job.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -27,23 +27,28 @@
 #include "rb_ecore_job.h"
 
 typedef struct {
-       Ecore_Job *job;
-       void *cb;
+       Ecore_Job *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreJob;
+} 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 void c_free (RbEcoreJob *job)
+static void c_mark (RbJob *job)
 {
-       if (job->job && !job->deleted)
-               ecore_job_del (job->job);
+       rb_gc_mark (job->callback);
+}
+
+static void c_free (RbJob *job)
+{
+       if (job->real && !job->deleted)
+               ecore_job_del (job->real);
 
        ecore_shutdown ();
 
@@ -53,17 +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, RbEcoreJob, NULL, c_free, job);
+       self = Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
 
        ecore_init ();
 
-       job->cb = (void *) rb_block_proc ();
-       job->job = ecore_job_add (on_job, job);
+       job->callback = rb_block_proc ();
+       job->real = ecore_job_add (on_job, job);
 
        rb_obj_call_init (self, 0, NULL);
 
@@ -73,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;
        }