Added Ecore::Evas::EcoreEvas#has_alpha? and #has_alpha=.

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

diff --git a/src/ecore/rb_fd_handler.c b/src/ecore/rb_fd_handler.c
index 4d7e08c9e616be99bb835a44954c6c41ecc002ca..c37e310bfd4d4034382e4dd775ae7829dcbbafca 100644 (file)
--- a/src/ecore/rb_fd_handler.c
+++ b/src/ecore/rb_fd_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_fd_handler.c 109 2004-09-01 20:33:15Z tilman $
+ * $Id: rb_fd_handler.c 351 2006-02-10 15:25:40Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -62,28 +62,30 @@ static void c_free (RbFdHandler *fdh)
        free (fdh);
 }
 
-static VALUE c_new (VALUE klass, VALUE fd, VALUE flags)
+static VALUE c_alloc (VALUE klass)
 {
-       VALUE self;
        RbFdHandler *fdh = NULL;
 
+       ecore_init ();
+
+       return Data_Make_Struct (klass, RbFdHandler, c_mark, c_free, fdh);
+}
+
+static VALUE c_init (VALUE self, VALUE fd, VALUE flags)
+{
+       GET_OBJ (self, RbFdHandler, fdh);
+
        if (!rb_block_given_p ())
-               return Qnil;
+               rb_raise (rb_eStandardError, "block missing");
 
        Check_Type (fd, T_FIXNUM);
        Check_Type (flags, T_FIXNUM);
 
-       self = Data_Make_Struct (klass, RbFdHandler, c_mark, c_free, fdh);
-
-       ecore_init ();
-
        fdh->callback = rb_block_proc ();
        fdh->real = ecore_main_fd_handler_add (FIX2INT (fd),
                                               FIX2INT (flags), on_change,
                                               fdh, NULL, NULL);
 
-       rb_obj_call_init (self, 0, NULL);
-
        return self;
 }
 
@@ -132,7 +134,8 @@ void Init_FdHandler (void)
 {
        VALUE c = rb_define_class_under (mEcore, "FdHandler", rb_cObject);
 
-       rb_define_singleton_method (c, "new", c_new, 2);
+       rb_define_alloc_func (c, c_alloc);
+       rb_define_method (c, "initialize", c_init, 2);
        rb_define_method (c, "delete", c_delete, 0);
        rb_define_method (c, "fd", c_fd_get, 0);
        rb_define_method (c, "get_active", c_get_active, 1);