Declare class variables the right way.

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

diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c
index 3bdf31f8723b0e4b885aa0159b68a490ac8f41ca..ce6bc03817828da9f55585eb9517ad22adfa1b72 100644 (file)
--- a/src/ecore/rb_idler.c
+++ b/src/ecore/rb_idler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_idler.c 9 2004-06-19 19:53:47Z tilman $
+ * $Id: rb_idler.c 40 2004-07-25 13:14:34Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -31,8 +31,6 @@ typedef struct {
        bool deleted;
 } RbEcoreIdler;
 
-VALUE cIdler;
-
 static int on_idler (void *data)
 {
        VALUE r;
@@ -49,23 +47,13 @@ static int on_idler (void *data)
        return (r != Qfalse);
 }
 
-static VALUE c_init (VALUE self)
-{
-       RbEcoreIdler *idler = NULL;
-
-       Data_Get_Struct (self, RbEcoreIdler, idler);
-
-       idler->cb = (void *) rb_block_proc ();
-       idler->idler = ecore_idler_add (on_idler, idler);
-
-       return self;
-}
-
 static void c_free (RbEcoreIdler *idler)
 {
        if (idler->idler && !idler->deleted)
                ecore_idler_del (idler->idler);
 
+       ecore_shutdown ();
+
        free (idler);
 }
 
@@ -74,8 +62,16 @@ static VALUE c_new (VALUE klass)
        VALUE self;
        RbEcoreIdler *idler;
 
+       if (!rb_block_given_p ())
+               return Qnil;
+
        self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
 
+       ecore_init ();
+
+       idler->cb = (void *) rb_block_proc ();
+       idler->idler = ecore_idler_add (on_idler, idler);
+
        rb_obj_call_init (self, 0, NULL);
 
        return self;
@@ -99,10 +95,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Idler (void)
 {
-       cIdler = rb_define_class_under (mEcore, "Idler", rb_cObject);
+       VALUE c = rb_define_class_under (mEcore, "Idler", rb_cObject);
 
-       rb_define_singleton_method (cIdler, "new", c_new, 1);
-       rb_define_method (cIdler, "initialize", c_init, 1);
-       rb_define_method (cIdler, "delete", c_delete, 0);
+       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "delete", c_delete, 0);
 }
-