projects
/
ruby-edje.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Class instantiation fixes.
[ruby-edje.git]
/
src
/
rb_edje_main.c
diff --git
a/src/rb_edje_main.c
b/src/rb_edje_main.c
index e00a2491e5ab9330dc9b7f66e4fc7500a3f033d3..b8699bad24bcddadc83cd9434ca7a0c2b3810a2c 100644
(file)
--- a/
src/rb_edje_main.c
+++ b/
src/rb_edje_main.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: rb_edje_main.c
287 2005-03-15 18:08:0
1Z tilman $
+ * $Id: rb_edje_main.c
345 2005-05-08 17:03:2
1Z tilman $
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
*
* Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
*
@@
-25,7
+25,6
@@
#include "rb_edje_main.h"
#include "rb_edje.h"
#include "rb_part.h"
#include "rb_edje_main.h"
#include "rb_edje.h"
#include "rb_part.h"
-#include "rb_messages.h"
/*
* call-seq:
/*
* call-seq:
@@
-35,7
+34,9
@@
*/
static VALUE m_freeze (VALUE self)
{
*/
static VALUE m_freeze (VALUE self)
{
+ edje_init ();
edje_freeze ();
edje_freeze ();
+ edje_shutdown ();
return Qnil;
}
return Qnil;
}
@@
-48,7
+49,9
@@
static VALUE m_freeze (VALUE self)
*/
static VALUE m_thaw (VALUE self)
{
*/
static VALUE m_thaw (VALUE self)
{
+ edje_init ();
edje_thaw ();
edje_thaw ();
+ edje_shutdown ();
return Qnil;
}
return Qnil;
}
@@
-61,7
+64,13
@@
static VALUE m_thaw (VALUE self)
*/
static VALUE m_frametime_get (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;
}
/*
}
/*
@@
-74,7
+83,9
@@
static VALUE m_frametime_set (VALUE self, VALUE val)
{
Check_Type (val, T_FLOAT);
{
Check_Type (val, T_FLOAT);
+ edje_init ();
edje_frametime_set (NUM2DBL (val));
edje_frametime_set (NUM2DBL (val));
+ edje_shutdown ();
return Qnil;
}
return Qnil;
}
@@
-88,14
+99,17
@@
static VALUE m_collections_get (VALUE self, VALUE file)
ary = rb_ary_new ();
ary = rb_ary_new ();
+ edje_init ();
+
list = edje_file_collection_list (StringValuePtr (file));
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;
}
return ary;
}
@@
-114,6
+128,5
@@
void Init_edje (void)
Init_Edje ();
Init_Part ();
Init_Edje ();
Init_Part ();
- Init_Messages ();
}
}