X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore%2Frb_idler.c;h=414b6fb85395c625f6a0913d833a9cf2997d0259;hp=77c35a30c235f95768af0c73de8a9389c6002f82;hb=98ce45a70b8b219b738bb804297417aae0ae9baa;hpb=9c5dfa014bb640230e2f71e55b6f8591dc42e2fb diff --git a/src/ecore/rb_idler.c b/src/ecore/rb_idler.c index 77c35a3..414b6fb 100644 --- a/src/ecore/rb_idler.c +++ b/src/ecore/rb_idler.c @@ -1,5 +1,5 @@ /* - * $Id: rb_idler.c 25 2004-06-26 23:07:01Z tilman $ + * $Id: rb_idler.c 27 2004-07-08 18:25:05Z tilman $ * * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de) * @@ -49,23 +49,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 +64,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; @@ -102,7 +100,6 @@ void Init_Idler (void) cIdler = 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); }