ecore_init and ecore_shutdown aren't exported anymore.

[ruby-ecore.git] / src / ecore_evas / rb_fb.c

diff --git a/src/ecore_evas/rb_fb.c b/src/ecore_evas/rb_fb.c
index 00635defd22d1f6071db46ddd317e814db4a0884..b5c262b7484a9883fe23236ca22e35c0e8e971e3 100644 (file)
--- a/src/ecore_evas/rb_fb.c
+++ b/src/ecore_evas/rb_fb.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_fb.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_fb.c 27 2004-07-08 18:25:05Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,19 +20,21 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Evas.h>
 
 #include "rb_ecore_evas_main.h"
 #include "rb_ecore_evas.h"
 
-static VALUE c_init (int argc, VALUE *argv, VALUE self)
+static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 {
-       VALUE disp, rot, w, h;
+       VALUE self, disp, rot, w, h;
        Ecore_Evas **ee = NULL;
        char *cdisp = NULL;
        int irot = 0, iw = 0, ih = 0;
 
-       Data_Get_Struct (self, Ecore_Evas *, ee);
+       self = Data_Make_Struct (klass, Ecore_Evas *,
+                                NULL, c_ecore_evas_free, ee);
 
        rb_scan_args (argc, argv, "04", &disp, &rot, &w, &h);
 
@@ -56,20 +58,12 @@ static VALUE c_init (int argc, VALUE *argv, VALUE self)
                ih = NUM2INT (h);
        }
 
-       *ee = ecore_evas_fb_new (cdisp, irot, iw, ih);
-
-       return self;
-}
-
-static VALUE c_new (int argc, VALUE *argv, VALUE klass)
-{
-       VALUE self;
-       Ecore_Evas **ee;
+       ecore_init ();
+       ecore_evas_init ();
 
-       self = Data_Make_Struct (klass, Ecore_Evas *,
-                                NULL, c_ecore_evas_free, ee);
+       *ee = ecore_evas_fb_new (cdisp, irot, iw, ih);
 
-       rb_obj_call_init (self, argc, argv);
+       rb_obj_call_init (self, 0, NULL);
 
        return self;
 }
@@ -79,6 +73,4 @@ void Init_Fb (void)
        VALUE cFb = rb_define_class_under (mEvas, "Fb", cEcoreEvas);
 
        rb_define_singleton_method (cFb, "new", c_new, -1);
-       rb_define_method (cFb, "initialize", c_init, -1);
 }
-