Reworked on_ecore_event().

[ruby-ecore.git] / src / ecore / rb_event_handler.c

diff --git a/src/ecore/rb_event_handler.c b/src/ecore/rb_event_handler.c
index 8e7312926373a0f8ec9b8ad3efceec518d736f8d..a360ef70cac34cb42447fcb5f831adb6930ac68a 100644 (file)
--- a/src/ecore/rb_event_handler.c
+++ b/src/ecore/rb_event_handler.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_event_handler.c 359 2006-02-12 15:51:58Z tilman $
+ * $Id: rb_event_handler.c 364 2006-02-14 19:06:43Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -130,8 +130,7 @@ static int on_ecore_event (void *data, int type, void *event)
 {
        RbEventHandler *h = NULL;
        VALUE handler, klass, obj, tmp, res;
-       int handler_type, len, i;
-       bool called = false;
+       int handler_type, len, ret = 1, i;
 
        /* instantiate the event object
         * first, find the class we're gonna use
@@ -154,18 +153,18 @@ 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
                         */
-                       if (res == Qfalse)
+                       if (res == Qfalse) {
+                               ret = 0;
                                break;
+                       }
                }
        }
 
-       /* call other event handlers, too */
-       return 1;
+       return ret;
 }
 
 VALUE c_ev_generic_init (VALUE self, VALUE event)