projects
/
ruby-ecore.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed the build with the latest Ecore snapshot.
[ruby-ecore.git]
/
src
/
ecore
/
rb_idle_enterer.c
diff --git
a/src/ecore/rb_idle_enterer.c
b/src/ecore/rb_idle_enterer.c
index 03e67166f3da4888896d6bd6cafb443a473e3c8a..641d60c19f8e3c33d8afb18d78fdcf8068edc516 100644
(file)
--- a/
src/ecore/rb_idle_enterer.c
+++ b/
src/ecore/rb_idle_enterer.c
@@
-1,6
+1,4
@@
/*
/*
- * $Id: rb_idle_enterer.c 152 2004-12-09 18:33:15Z tilman $
- *
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
@@
-62,6
+60,16
@@
static void c_free (RbIdleEnterer *idle_enterer)
free (idle_enterer);
}
free (idle_enterer);
}
+static VALUE c_alloc (VALUE klass)
+{
+ RbIdleEnterer *idle_enterer;
+
+ ecore_init ();
+
+ return Data_Make_Struct (klass, RbIdleEnterer, c_mark, c_free,
+ idle_enterer);
+}
+
/*
* call-seq:
* Ecore::IdleEnterer.new { block } => idle_enterer
/*
* call-seq:
* Ecore::IdleEnterer.new { block } => idle_enterer
@@
-70,26
+78,18
@@
static void c_free (RbIdleEnterer *idle_enterer)
* When Ecore enters the idle state, the specified block will be called.
* If the block returns false, the IdleEnterer is deleted.
*/
* When Ecore enters the idle state, the specified block will be called.
* If the block returns false, the IdleEnterer is deleted.
*/
-static VALUE c_
new (VALUE klass
)
+static VALUE c_
init (VALUE self
)
{
{
- VALUE self;
- RbIdleEnterer *idle_enterer;
+ GET_OBJ (self, RbIdleEnterer, idle_enterer);
if (!rb_block_given_p ())
if (!rb_block_given_p ())
- return Qnil;
-
- self = Data_Make_Struct (klass, RbIdleEnterer, c_mark, c_free,
- idle_enterer);
-
- ecore_init ();
+ rb_raise (rb_eStandardError, "block missing");
idle_enterer->callback = rb_block_proc ();
idle_enterer->deleted = false;
idle_enterer->real = ecore_idle_enterer_add (on_idle_enter,
idle_enterer);
idle_enterer->callback = rb_block_proc ();
idle_enterer->deleted = false;
idle_enterer->real = ecore_idle_enterer_add (on_idle_enter,
idle_enterer);
- rb_obj_call_init (self, 0, NULL);
-
return self;
}
return self;
}
@@
-117,6
+117,7
@@
void Init_IdleEnterer (void)
{
VALUE c = rb_define_class_under (mEcore, "IdleEnterer", rb_cObject);
{
VALUE c = rb_define_class_under (mEcore, "IdleEnterer", rb_cObject);
- rb_define_singleton_method (c, "new", c_new, 1);
+ rb_define_alloc_func (c, c_alloc);
+ rb_define_method (c, "initialize", c_init, 0);
rb_define_method (c, "delete", c_delete, 0);
}
rb_define_method (c, "delete", c_delete, 0);
}