From 8df3535f85c3fd7a1f00d989c5e27416e7ade8b4 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Sun, 12 Feb 2006 15:51:58 +0000 Subject: [PATCH] Code cleanup. --- src/ecore/rb_event_handler.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c index 12e2739..8e73129 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 359 2006-02-12 15:51:58Z 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,21 @@ 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; @@ -166,9 +164,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; } -- 2.30.2