From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Sun, 8 May 2005 17:03:21 +0000 (+0000)
Subject: Edje module functions: make sure that edje is initialized.
X-Git-Url: http://git.code-monkey.de/?p=ruby-edje.git;a=commitdiff_plain;h=de08e354b9785a7416c6ee1ab770fd9fff1ea3bb

Edje module functions: make sure that edje is initialized.
---

diff --git a/src/rb_edje_main.c b/src/rb_edje_main.c
index d11d456..b8699ba 100644
--- a/src/rb_edje_main.c
+++ b/src/rb_edje_main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_edje_main.c 330 2005-04-28 15:38:47Z tilman $
+ * $Id: rb_edje_main.c 345 2005-05-08 17:03:21Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -34,7 +34,9 @@
  */
 static VALUE m_freeze (VALUE self)
 {
+	edje_init ();
 	edje_freeze ();
+	edje_shutdown ();
 
 	return Qnil;
 }
@@ -47,7 +49,9 @@ static VALUE m_freeze (VALUE self)
  */
 static VALUE m_thaw (VALUE self)
 {
+	edje_init ();
 	edje_thaw ();
+	edje_shutdown ();
 
 	return Qnil;
 }
@@ -60,7 +64,13 @@ static VALUE m_thaw (VALUE self)
  */
 static VALUE m_frametime_get (VALUE self)
 {
-	return rb_float_new (edje_frametime_get ());
+	VALUE ret;
+
+	edje_init ();
+	ret = rb_float_new (edje_frametime_get ());
+	edje_shutdown ();
+
+	return ret;
 }
 
 /*
@@ -73,7 +83,9 @@ static VALUE m_frametime_set (VALUE self, VALUE val)
 {
 	Check_Type (val, T_FLOAT);
 
+	edje_init ();
 	edje_frametime_set (NUM2DBL (val));
+	edje_shutdown ();
 
 	return Qnil;
 }
@@ -87,14 +99,17 @@ static VALUE m_collections_get (VALUE self, VALUE file)
 
 	ary = rb_ary_new ();
 
+	edje_init ();
+
 	list = edje_file_collection_list (StringValuePtr (file));
-	if (!list)
-		return ary;
+	if (list) {
+		for (l = list; l; l = l->next)
+			rb_ary_push (ary, rb_str_new2 (l->data));
 
-	for (l = list; l; l = l->next)
-		rb_ary_push (ary, rb_str_new2 (l->data));
+		edje_file_collection_list_free (list);
+	}
 
-	edje_file_collection_list_free (list);
+	edje_shutdown ();
 
 	return ary;
 }