edje_init() and edje_shutdown() aren't exported anymore.

Instead, they are called automatically in the object's (de)constructor.

diff --git a/src/rb_edje.c b/src/rb_edje.c
index 483067c7c76142ddc7e75d4f614a8a9fa2742b83..34b6dc534ac7daf44b3a5eba48f0e28a2e3d6327 100644 (file)
--- a/src/rb_edje.c
+++ b/src/rb_edje.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_edje.c 24 2004-06-26 22:59:56Z tilman $
+ * $Id: rb_edje.c 28 2004-07-08 18:35:51Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -44,6 +44,13 @@
                return Qnil; \
        }
 
                return Qnil; \
        }
 

+static void c_free (Evas_Object **e)
+{
+       c_evas_object_free (e);
+
+       edje_shutdown ();
+}
+

 static VALUE c_new (VALUE klass, VALUE evas)
 {
        VALUE self, argv[1];
 static VALUE c_new (VALUE klass, VALUE evas)
 {
        VALUE self, argv[1];


@@ -58,8 +65,10 @@ static VALUE c_new (VALUE klass, VALUE evas)
 
        GET_OBJ (evas, Evas, e, "Evas");
 
 
        GET_OBJ (evas, Evas, e, "Evas");
 

+       edje_init ();
+

        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,
        self = Data_Make_Struct (klass, Evas_Object *, c_evas_object_mark,

-                                c_evas_object_free, edje);
+                                c_free, edje);

        *edje = edje_object_add (*e);
 
        argv[0] = evas;
        *edje = edje_object_add (*e);
 
        argv[0] = evas;

diff --git a/src/rb_edje_main.c b/src/rb_edje_main.c
index f9c37bc6c54930ebaec15bceb6a6925428c84eef..974d7ff793831394cc2c835dc0cfab98545c7aef 100644 (file)
--- a/src/rb_edje_main.c
+++ b/src/rb_edje_main.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: rb_edje_main.c 17 2004-06-22 19:37:54Z tilman $
+ * $Id: rb_edje_main.c 28 2004-07-08 18:35:51Z tilman $

  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -25,6 +25,7 @@
 #include "rb_edje_main.h"
 #include "rb_edje.h"
 
 #include "rb_edje_main.h"
 #include "rb_edje.h"
 

+#ifdef DEBUG

 static VALUE m_init (VALUE self)
 {
        return INT2FIX (edje_init ());
 static VALUE m_init (VALUE self)
 {
        return INT2FIX (edje_init ());


@@ -32,10 +33,9 @@ static VALUE m_init (VALUE self)
 
 static VALUE m_shutdown (VALUE self)
 {
 
 static VALUE m_shutdown (VALUE self)
 {

-       rb_gc_start ();
-

        return INT2FIX (edje_shutdown ());
 }
        return INT2FIX (edje_shutdown ());
 }

+#endif

 
 static VALUE m_freeze (VALUE self)
 {
 
 static VALUE m_freeze (VALUE self)
 {


@@ -71,8 +71,11 @@ void Init_edje (void)
 
        mEdje = rb_define_module ("Edje");
 
 
        mEdje = rb_define_module ("Edje");
 

+#ifdef DEBUG

        rb_define_module_function (mEdje, "init", m_init, 0);
        rb_define_module_function (mEdje, "shutdown", m_shutdown, 0);
        rb_define_module_function (mEdje, "init", m_init, 0);
        rb_define_module_function (mEdje, "shutdown", m_shutdown, 0);

+#endif
+

        rb_define_module_function (mEdje, "freeze", m_freeze, 0);
        rb_define_module_function (mEdje, "thaw", m_thaw, 0);
        rb_define_module_function (mEdje, "frametime", m_frametime_get, 0);
        rb_define_module_function (mEdje, "freeze", m_freeze, 0);
        rb_define_module_function (mEdje, "thaw", m_thaw, 0);
        rb_define_module_function (mEdje, "frametime", m_frametime_get, 0);