X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Frb_evas_object.c;h=6e93a8fe3bec6fc5eaae14243988e7d918171d40;hb=e012a51b703ddd23c407d308602246d07ff73d2e;hp=b32f2b8ebf5c4d425b740dc8364aa88e7b012f3f;hpb=2798e153edf68de89ca2ea53732d01ef7c7f0b64;p=ruby-evas.git

diff --git a/src/rb_evas_object.c b/src/rb_evas_object.c
index b32f2b8..6e93a8f 100644
--- a/src/rb_evas_object.c
+++ b/src/rb_evas_object.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_evas_object.c 281 2005-03-14 20:51:40Z tilman $
+ * $Id: rb_evas_object.c 304 2005-03-22 17:51:51Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -49,7 +49,12 @@ VALUE TO_EVAS_OBJECT (Evas_Object *o)
 void c_evas_object_mark (RbEvasObject *e)
 {
 	rb_gc_mark (e->parent);
-	rb_gc_mark (e->callbacks);
+
+	if (!NIL_P (e->callbacks))
+		rb_gc_mark (e->callbacks);
+
+	if (!NIL_P (e->userdata))
+		rb_gc_mark (e->userdata);
 }
 
 void c_evas_object_free (RbEvasObject *e, bool free_mem)
@@ -69,7 +74,7 @@ static VALUE c_init (VALUE self, VALUE parent)
 	evas_object_data_set (e->real, RUBY_EVAS_OBJECT_KEY, (void *) self);
 
 	e->parent = parent;
-	e->callbacks = rb_hash_new ();
+	e->callbacks = Qnil;
 
 	return self;
 }
@@ -487,6 +492,16 @@ static VALUE c_below_get (VALUE self)
 	return TO_EVAS_OBJECT (evas_object_below_get (e->real));
 }
 
+static VALUE c_userdata_get (VALUE self)
+{
+	GET_OBJ (self, RbEvasObject, e);
+
+	if (NIL_P (e->userdata))
+		e->userdata = rb_hash_new ();
+
+	return e->userdata;
+}
+
 void Init_EvasObject (void)
 {
 	cEvasObject = rb_define_class_under (mEvas, "EvasObject",
@@ -524,4 +539,5 @@ void Init_EvasObject (void)
 	rb_define_method (cEvasObject, "stack_below", c_stack_below, 1);
 	rb_define_method (cEvasObject, "above", c_above_get, 0);
 	rb_define_method (cEvasObject, "below", c_below_get, 0);
+	rb_define_method (cEvasObject, "userdata", c_userdata_get, 0);
 }