We now use real structs to wrap objects.

[ruby-ecore.git] / src / ecore / rb_idler.c

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index ce6bc03817828da9f55585eb9517ad22adfa1b72..b890ef59a49b5726523e610a134c68ee03c33524 100644 (file)
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_idler.c 40 2004-07-25 13:14:34Z tilman $
+ * $Id: rb_idler.c 50 2004-08-01 10:18:39Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -19,24 +19,24 @@
  */
 
 #include <ruby.h>
+#include <stdbool.h>
 
 #include <Ecore.h>
-#include <stdbool.h>
 
 #include "rb_ecore.h"
 
 typedef struct {
-       Ecore_Idler *idler;
-       void *cb;
+       Ecore_Idler *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreIdler;
+} RbIdler;
 
 static int on_idler (void *data)
 {
        VALUE r;
-       RbEcoreIdler *idler = data;
+       RbIdler *idler = data;
 
-       r = rb_funcall ((VALUE) idler->cb, rb_intern ("call"), 0);
+       r = rb_funcall (idler->callback, rb_intern ("call"), 0);
 
        /* if the callback returns false, we return 0 and Ecore
         * will remove the idler
@@ -47,10 +47,15 @@ static int on_idler (void *data)
        return (r != Qfalse);
 }
 
-static void c_free (RbEcoreIdler *idler)
+static void c_mark (RbIdler *idler)
+{
+       rb_gc_mark (idler->callback);
+}
+
+static void c_free (RbIdler *idler)
 {
-       if (idler->idler && !idler->deleted)
-               ecore_idler_del (idler->idler);
+       if (idler->real && !idler->deleted)
+               ecore_idler_del (idler->real);
 
        ecore_shutdown ();
 
@@ -60,17 +65,17 @@ static void c_free (RbEcoreIdler *idler)
 static VALUE c_new (VALUE klass)
 {
        VALUE self;
-       RbEcoreIdler *idler;
+       RbIdler *idler;
 
        if (!rb_block_given_p ())
                return Qnil;
 
-       self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
+       self = Data_Make_Struct (klass, RbIdler, c_mark, c_free, idler);
 
        ecore_init ();
 
-       idler->cb = (void *) rb_block_proc ();
-       idler->idler = ecore_idler_add (on_idler, idler);
+       idler->callback = rb_block_proc ();
+       idler->real = ecore_idler_add (on_idler, idler);
 
        rb_obj_call_init (self, 0, NULL);
 
@@ -79,13 +84,11 @@ static VALUE c_new (VALUE klass)
 
 static VALUE c_delete (VALUE self)
 {
-       RbEcoreIdler *idler = NULL;
-
-       Data_Get_Struct (self, RbEcoreIdler, idler);
+       GET_OBJ (self, RbIdler, idler);
 
-       if (idler->idler && !idler->deleted) {
-               ecore_idler_del (idler->idler);
-               idler->idler = NULL;
+       if (idler->real && !idler->deleted) {
+               ecore_idler_del (idler->real);
+               idler->real = NULL;
                idler->deleted = true;
        } else
                rb_raise (rb_eException, "Idler already deleted!");