projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ecore_init and ecore_shutdown aren't exported anymore.
[ruby-ecore.git]
/
src
/
ecore
/
rb_idler.c
diff --git
a/src/ecore/rb_idler.c
b/src/ecore/rb_idler.c
index 77c35a30c235f95768af0c73de8a9389c6002f82..414b6fb85395c625f6a0913d833a9cf2997d0259 100644
(file)
--- a/
src/ecore/rb_idler.c
+++ b/
src/ecore/rb_idler.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_idler.c 2
5 2004-06-26 23:07:01
Z tilman $
+ * $Id: rb_idler.c 2
7 2004-07-08 18:25:05
Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-49,23
+49,13
@@
static int on_idler (void *data)
return (r != Qfalse);
}
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);
static void c_free (RbEcoreIdler *idler)
{
if (idler->idler && !idler->deleted)
ecore_idler_del (idler->idler);
+ ecore_shutdown ();
+
free (idler);
}
free (idler);
}
@@
-74,8
+64,16
@@
static VALUE c_new (VALUE klass)
VALUE self;
RbEcoreIdler *idler;
VALUE self;
RbEcoreIdler *idler;
+ if (!rb_block_given_p ())
+ return Qnil;
+
self = Data_Make_Struct (klass, RbEcoreIdler, NULL, c_free, idler);
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;
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);
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);
}
rb_define_method (cIdler, "delete", c_delete, 0);
}