X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore%2Frb_event_handler.c;h=f296ae26255655b8f0f96966738b841fd2368f29;hb=2f0a58839f94493eae629ae5bf45f50bfcd9fa0e;hp=12e2739b1740392de2d1a8c81f9a47e93caf7941;hpb=fecda12a49e445f7de3c6e6452c65b96cd6861e5;p=ruby-ecore.git

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 12e2739..f296ae2 100644
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 358 2006-02-12 15:42:28Z tilman $
+ * $Id: rb_event_handler.c 363 2006-02-14 19:02:53Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -117,7 +117,7 @@ static VALUE c_delete (VALUE self)
 			h->real = NULL;
 			h->deleted = true;
 
-			return Qnil;
+			break;
 		}
 
 		rb_ary_push (handlers, el);
@@ -129,23 +129,20 @@ static VALUE c_delete (VALUE self)
 static int on_ecore_event (void *data, int type, void *event)
 {
 	RbEventHandler *h = NULL;
-	VALUE handler, klass, obj, argv[1], res;
+	VALUE handler, klass, obj, tmp, res;
 	int handler_type, len, i;
-	bool called = false;
 
 	/* instantiate the event object
 	 * first, find the class we're gonna use
 	 */
-	if (NIL_P (klass = rb_hash_aref (event_classes, INT2NUM (type)))) {
+	klass = rb_hash_aref (event_classes, INT2NUM (type));
+	if (NIL_P (klass))
 		rb_raise (rb_eException, "Cannot find event class "
 		                         "for event %i\n", type);
-		return 0;
-	}
 
 	/* now create and init the object */
-	obj = rb_obj_alloc (klass);
-	argv[0] = (VALUE) event;
-	rb_obj_call_init (obj, 1, argv);
+	tmp = (VALUE) event;
+	obj = rb_class_new_instance (1, &tmp, klass);
 
 	len = RARRAY (handlers)->len;
 
@@ -156,7 +153,6 @@ static int on_ecore_event (void *data, int type, void *event)
 		if (handler_type == type) {
 			Data_Get_Struct (handler, RbEventHandler, h);
 			res = rb_funcall (h->callback, rb_intern ("call"), 1, obj);
-			called = true;
 
 			/* if the block returned false, don't call the other
 			 * event handlers
@@ -166,9 +162,6 @@ static int on_ecore_event (void *data, int type, void *event)
 		}
 	}
 
-	if (type == ECORE_EVENT_SIGNAL_EXIT && !called)
-		ecore_main_loop_quit ();
-
 	/* call other event handlers, too */
 	return 1;
 }