X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fesmart_file_dialog%2Frb_esmart_file_dialog.c;h=f188d804f2dd487573513775923e553e3ae82051;hb=1969f6740e354d24f5a05436d0d3ffa63f9dbae9;hp=a45d3a49e245cb87e1b3bc280aa8f5b650aa51be;hpb=6685e8b62f8539353617e4537c7409da5b5f417d;p=ruby-esmart.git

diff --git a/src/esmart_file_dialog/rb_esmart_file_dialog.c b/src/esmart_file_dialog/rb_esmart_file_dialog.c
index a45d3a4..f188d80 100644
--- a/src/esmart_file_dialog/rb_esmart_file_dialog.c
+++ b/src/esmart_file_dialog/rb_esmart_file_dialog.c
@@ -1,6 +1,4 @@
 /*
- * $Id: rb_esmart_file_dialog.c 337 2005-05-02 17:48:20Z tilman $
- *
  * Copyright (C) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
  * This library is free software; you can redistribute it and/or
@@ -35,6 +33,8 @@ typedef struct {
 static void on_action (void *data, Evas_Object *edje,
                        Esmart_File_Dialog_Op op);
 
+static VALUE cEdje;
+
 static void c_mark (RbFileDialog *e)
 {
 	c_evas_object_mark (&e->real);
@@ -52,11 +52,15 @@ static void c_free (RbFileDialog *e)
 	free (e);
 }
 
-static VALUE c_new (VALUE klass, VALUE evas, VALUE edj)
+static VALUE c_alloc (VALUE klass)
 {
-	VALUE self, argv[1];
 	RbFileDialog *fd = NULL;
 
+	return Data_Make_Struct (klass, RbFileDialog, c_mark, c_free, fd);
+}
+
+static VALUE c_init (VALUE self, VALUE evas, VALUE edj)
+{
 	if (!rb_block_given_p ()) {
 		rb_raise (rb_eStandardError, "no block given");
 		return Qnil;
@@ -65,16 +69,15 @@ static VALUE c_new (VALUE klass, VALUE evas, VALUE edj)
 	CHECK_CLASS (evas, cEvas);
 	StringValue (edj);
 	GET_OBJ (evas, RbEvas, e);
+	GET_OBJ (self, RbFileDialog, fd);
 
-	self = Data_Make_Struct (klass, RbFileDialog, c_mark, c_free, fd);
 	fd->real.real = esmart_file_dialog_new (e->real,
 	                                        StringValuePtr (edj));
 
 	if (!fd->real.real)
 		rb_raise (rb_eStandardError, "failed");
 
-	argv[0] = evas;
-	rb_obj_call_init (self, 1, argv);
+	rb_call_super (1, &evas);
 
 	fd->callback = rb_block_proc ();
 	fd->edje = Qnil;
@@ -119,20 +122,12 @@ static void on_action (void *data, Evas_Object *edje,
 static VALUE c_edje_get (VALUE self)
 {
 	Evas_Object *e;
-	VALUE mEdje, cEdje, s;
-	ID const_get;
 
 	GET_OBJ (self, RbFileDialog, fd);
 
 	if (!NIL_P (fd->edje))
 		return fd->edje;
 
-	const_get = rb_intern ("const_get");
-	s = rb_str_new2 ("Edje");
-
-	mEdje = rb_funcall (rb_cModule, const_get, 1, s);
-	cEdje = rb_funcall (mEdje, const_get, 1, s);
-
 	e = esmart_file_dialog_edje_get (fd->real.real);
 	fd->edje = rb_funcall (cEdje, rb_intern ("new_from_pointer"), 2,
 	                       TO_EVAS (self, evas_object_evas_get (e)),
@@ -173,13 +168,18 @@ static VALUE c_current_directory_get (VALUE self)
 
 void Init_esmart_file_dialog (void)
 {
-	VALUE c;
+	VALUE m, c;
 
 	rb_require ("esmart");
+	rb_require ("edje");
+
+	m = rb_const_get (rb_cModule, rb_intern ("Edje"));
+	cEdje = rb_const_get (m, rb_intern ("Edje"));
 
 	c = rb_define_class_under (mEsmart, "FileDialog", cEvasObject);
 
-	rb_define_singleton_method (c, "new", c_new, 2);
+	rb_define_alloc_func (c, c_alloc);
+	rb_define_method (c, "initialize", c_init, 2);
 	rb_define_method (c, "edje", c_edje_get, 0);
 	rb_define_method (c, "selections", c_selections_get, 0);
 	rb_define_method (c, "current_directory", c_current_directory_get, 0);