Class instantiation fixes.

[ruby-evas.git] / src / rb_image.c

diff --git a/src/rb_image.c b/src/rb_image.c
index 7bd0f06a0ad9398d5c2ffac2e6bf438bb3705ae8..8e7f5ed797f96d404087d2fb16e0cd21e5ecc567 100644 (file)
--- a/src/rb_image.c
+++ b/src/rb_image.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_image.c 284 2005-03-15 18:00:33Z tilman $
+ * $Id: rb_image.c 354 2006-02-10 18:14:08Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -26,31 +26,21 @@
 #include "rb_evas.h"
 #include "rb_evas_object.h"
 
-static void c_free (RbEvasObject *e)
-{
-       c_evas_object_free (e, true);
-}
-
 /*
  * call-seq:
  *  Evas::Image.new(evas) => img
  *
  * Creates an Evas::Image object.
  */
-static VALUE c_new (VALUE klass, VALUE evas)
+static VALUE c_init (VALUE self, VALUE evas)
 {
-       VALUE self, argv[1];
-       RbEvasObject *img;
-
        CHECK_CLASS (evas, cEvas);
        GET_OBJ (evas, RbEvas, e);
+       GET_OBJ (self, RbEvasObject, img);
 
-       self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
-                                c_free, img);
        img->real = evas_object_image_add (e->real);
 
-       argv[0] = evas;
-       rb_obj_call_init (self, 1, argv);
+       rb_call_super (1, &evas);
 
        return self;
 }
@@ -269,7 +259,7 @@ void Init_Image (void)
 {
        VALUE c = rb_define_class_under (mEvas, "Image", cEvasObject);
 
-       rb_define_singleton_method (c, "new", c_new, 1);
+       rb_define_method (c, "initialize", c_init, 1);
        rb_define_method (c, "get_file", c_get_file, -1);
        rb_define_method (c, "set_file", c_set_file, -1);
        rb_define_method (c, "has_alpha?", c_has_alpha_get, 0);