X-Git-Url: http://git.code-monkey.de/?p=ruby-esmart.git;a=blobdiff_plain;f=src%2Fesmart_draggies%2Frb_esmart_draggies.c;fp=src%2Fesmart_draggies%2Frb_esmart_draggies.c;h=e9eac004163b20124a61db79f36f73cc4548ca7b;hp=c422af512e30ad2d7d97afcbc11d90cab75660c2;hb=f48bba2d3cf64903ab176f6f957589a0a9ffa660;hpb=d801ea49773d7c98540d1c01be877b17c52f1fb6

diff --git a/src/esmart_draggies/rb_esmart_draggies.c b/src/esmart_draggies/rb_esmart_draggies.c
index c422af5..e9eac00 100644
--- a/src/esmart_draggies/rb_esmart_draggies.c
+++ b/src/esmart_draggies/rb_esmart_draggies.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_esmart_draggies.c 316 2005-04-24 20:07:36Z tilman $
+ * $Id: rb_esmart_draggies.c 356 2006-02-10 18:27:31Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -32,29 +32,22 @@ static void on_mouse_up (void *data, Evas *e, Evas_Object *o, void *ev)
 	ecore_evas_raise (data);
 }
 
-static void c_free (RbEvasObject *e)
+static VALUE c_init (VALUE self, VALUE ecore_evas)
 {
-	c_evas_object_free (e, true);
-}
-
-static VALUE c_new (VALUE klass, VALUE ecore_evas)
-{
-	VALUE self, argv[1];
 	static ID evas;
-	RbEvasObject *draggies;
+	VALUE tmp;
 
 	CHECK_CLASS (ecore_evas, cEcoreEvas);
 	GET_OBJ (ecore_evas, RbEcoreEvas, ee);
+	GET_OBJ (self, RbEvasObject, draggies);
 
-	self = Data_Make_Struct (klass, RbEvasObject, c_evas_object_mark,
-	                         c_free, draggies);
 	draggies->real = esmart_draggies_new (ee->real);
 
 	if (!evas)
 		evas = rb_intern ("evas");
 
-	argv[0] = rb_funcall (ecore_evas, evas, 0);
-	rb_obj_call_init (self, 1, argv);
+	tmp = rb_funcall (ecore_evas, evas, 0);
+	rb_call_super (1, &tmp);
 
 	esmart_draggies_event_callback_add (draggies->real,
 	                                    EVAS_CALLBACK_MOUSE_UP,
@@ -83,6 +76,6 @@ void Init_esmart_draggies (void)
 
 	c = rb_define_class_under (mEsmart, "Draggies", cEvasObject);
 
-	rb_define_singleton_method (c, "new", c_new, 1);
+	rb_define_method (c, "initialize", c_init, 1);
 	rb_define_method (c, "button=", c_button_set, 1);
 }