X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fesmart_draggies%2Frb_esmart_draggies.c;h=287c1163969b6cc35b30bf05d78ef07a6701f382;hb=d57197cd852375ac37b002df1ebdd8259e4a1e80;hp=c422af512e30ad2d7d97afcbc11d90cab75660c2;hpb=3528451b849fcc1650a5d76da48f334b3fdecf6b;p=ruby-esmart.git

diff --git a/src/esmart_draggies/rb_esmart_draggies.c b/src/esmart_draggies/rb_esmart_draggies.c
index c422af5..287c116 100644
--- a/src/esmart_draggies/rb_esmart_draggies.c
+++ b/src/esmart_draggies/rb_esmart_draggies.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_esmart_draggies.c 316 2005-04-24 20:07:36Z tilman $
- *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -32,29 +30,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)
-{
-	c_evas_object_free (e, true);
-}
-
-static VALUE c_new (VALUE klass, VALUE ecore_evas)
+static VALUE c_init (VALUE self, 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 +74,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);
 }