diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 1cbea62a4f..610b1affa4 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -84,8 +84,11 @@ extern "C" {
    
    EAPI extern Ecore_Version *ecore_version;
 
-#define ECORE_CALLBACK_CANCEL 0 /**< Return value to remove a callback */
-#define ECORE_CALLBACK_RENEW 1  /**< Return value to keep a callback */
+#define ECORE_CALLBACK_CANCEL EINA_FALSE /**< Return value to remove a callback */
+#define ECORE_CALLBACK_RENEW EINA_TRUE  /**< Return value to keep a callback */
+
+#define ECORE_CALLBACK_PASS_ON EINA_TRUE /**< Return value to pass event to next handler */
+#define ECORE_CALLBACK_DONE EINA_FALSE /**< Return value to stop event handling */
 
 #define ECORE_EVENT_NONE            0
 #define ECORE_EVENT_SIGNAL_USER     1 /**< User signal event */
@@ -257,12 +260,12 @@ extern "C" {
    EAPI void ecore_app_args_get(int *argc, char ***argv);
    EAPI void ecore_app_restart(void);
 
-   EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data);
+   EAPI Ecore_Event_Handler *ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
    EAPI void                *ecore_event_handler_del(Ecore_Event_Handler *event_handler);
    EAPI Ecore_Event         *ecore_event_add(int type, void *ev, void (*func_free) (void *data, void *ev), void *data);
    EAPI void                *ecore_event_del(Ecore_Event *event);
    EAPI int                  ecore_event_type_new(void);
-   EAPI Ecore_Event_Filter  *ecore_event_filter_add(void * (*func_start) (void *data), int (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data);
+   EAPI Ecore_Event_Filter  *ecore_event_filter_add(void * (*func_start) (void *data), Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data);
    EAPI void                *ecore_event_filter_del(Ecore_Event_Filter *ef);
    EAPI int                  ecore_event_current_type_get(void);
    EAPI void                *ecore_event_current_event_get(void);
@@ -294,14 +297,14 @@ extern "C" {
    EAPI void        ecore_exe_signal(Ecore_Exe *exe, int num);
    EAPI void        ecore_exe_hup(Ecore_Exe *exe);
 
-   EAPI Ecore_Idler *ecore_idler_add(int (*func) (void *data), const void *data);
+   EAPI Ecore_Idler *ecore_idler_add(Eina_Bool (*func) (void *data), const void *data);
    EAPI void        *ecore_idler_del(Ecore_Idler *idler);
 
-   EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(int (*func) (void *data), const void *data);
-   EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(int (*func) (void *data), const void *data);
+   EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data);
+   EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Eina_Bool (*func) (void *data), const void *data);
    EAPI void               *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
 
-   EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(int (*func) (void *data), const void *data);
+   EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Eina_Bool (*func) (void *data), const void *data);
    EAPI void              *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
 
    EAPI void              ecore_main_loop_iterate(void);
@@ -314,14 +317,16 @@ extern "C" {
        
    EAPI void              ecore_main_loop_begin(void);
    EAPI void              ecore_main_loop_quit(void);
-   EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data);
+   EAPI Ecore_Fd_Handler *ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
+						    Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data,
+						    Eina_Bool (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data);
    EAPI void              ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler, void (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data);
    EAPI void             *ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler);
    EAPI int               ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler);
    EAPI int               ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
    EAPI void              ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler, Ecore_Fd_Handler_Flags flags);
 
-   EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, int (*func) (void *data, Ecore_Win32_Handler *wh), const void *data);
+   EAPI Ecore_Win32_Handler *ecore_main_win32_handler_add(void *h, Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh), const void *data);
    EAPI void                *ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler);
 
    EAPI Ecore_Pipe  *ecore_pipe_add(void (*handler) (void *data, void *buffer, unsigned int nbyte), const void *data);
@@ -336,8 +341,8 @@ extern "C" {
    EAPI double ecore_time_get(void);
    EAPI double ecore_loop_time_get(void);
 
-   EAPI Ecore_Timer *ecore_timer_add(double in, int (*func) (void *data), const void *data);
-   EAPI Ecore_Timer *ecore_timer_loop_add(double in, int (*func) (void *data), const void *data);
+   EAPI Ecore_Timer *ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data);
+   EAPI Ecore_Timer *ecore_timer_loop_add(double in, Eina_Bool (*func) (void *data), const void *data);
    EAPI void        *ecore_timer_del(Ecore_Timer *timer);
    EAPI void         ecore_timer_interval_set(Ecore_Timer *timer, double in);
    EAPI double       ecore_timer_interval_get(Ecore_Timer *timer);
@@ -349,7 +354,7 @@ extern "C" {
    EAPI double       ecore_timer_precision_get(void);
    EAPI void         ecore_timer_precision_set(double precision);
 
-   EAPI Ecore_Animator *ecore_animator_add(int (*func) (void *data), const void *data);
+   EAPI Ecore_Animator *ecore_animator_add(Eina_Bool (*func) (void *data), const void *data);
    EAPI void           *ecore_animator_del(Ecore_Animator *animator);
    EAPI void		ecore_animator_freeze(Ecore_Animator *animator);
    EAPI void		ecore_animator_thaw(Ecore_Animator *animator);
@@ -360,7 +365,7 @@ extern "C" {
    EAPI double        ecore_poller_poll_interval_get(Ecore_Poller_Type type);
    EAPI Eina_Bool     ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval);
    EAPI int           ecore_poller_poller_interval_get(Ecore_Poller *poller);
-   EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, int (*func) (void *data), const void *data);
+   EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Eina_Bool (*func) (void *data), const void *data);
    EAPI void         *ecore_poller_del(Ecore_Poller *poller);
 
    EAPI Ecore_Job *ecore_job_add(void (*func) (void *data), const void *data);
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index a77bf2c293..910e759deb 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -46,7 +46,7 @@ EAPI Ecore_Version *ecore_version = &_version;
    if (Global < (Local))			\
      Global = Local;
 
-static int _ecore_memory_statistic(void *data);
+static Eina_Bool _ecore_memory_statistic(void *data);
 static int _ecore_memory_max_total = 0;
 static int _ecore_memory_max_free = 0;
 static pid_t _ecore_memory_pid = 0;
@@ -386,7 +386,7 @@ _ecore_fps_debug_runtime_add(double t)
 }
 
 #if HAVE_MALLINFO
-static int
+static Eina_Bool
 _ecore_memory_statistic(__UNUSED__ void *data)
 {
    struct mallinfo mi;
@@ -415,6 +415,6 @@ _ecore_memory_statistic(__UNUSED__ void *data)
    KEEP_MAX(_ecore_memory_max_total, mi.uordblks);
    KEEP_MAX(_ecore_memory_max_free, mi.fordblks);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 #endif
diff --git a/legacy/ecore/src/lib/ecore/ecore_anim.c b/legacy/ecore/src/lib/ecore/ecore_anim.c
index 96aa844f3b..121e49f04e 100644
--- a/legacy/ecore/src/lib/ecore/ecore_anim.c
+++ b/legacy/ecore/src/lib/ecore/ecore_anim.c
@@ -18,7 +18,7 @@ struct _Ecore_Animator
    EINA_INLIST;
    ECORE_MAGIC;
 
-   int           (*func) (void *data);
+   Eina_Bool    (*func) (void *data);
    void          *data;
 
    Eina_Bool     delete_me : 1;
@@ -26,7 +26,7 @@ struct _Ecore_Animator
 };
 
 
-static int _ecore_animator(void *data);
+static Eina_Bool _ecore_animator(void *data);
 
 static Ecore_Timer    *timer = NULL;
 static int             animators_delete_me = 0;
@@ -51,7 +51,7 @@ static double          animators_frametime = 1.0 / 30.0;
  * automatically making any references/handles for it invalid.
  */
 EAPI Ecore_Animator *
-ecore_animator_add(int (*func) (void *data), const void *data)
+ecore_animator_add(Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Animator *animator;
 
@@ -195,7 +195,7 @@ _ecore_animator_shutdown(void)
      }
 }
 
-static int
+static Eina_Bool
 _ecore_animator(void *data __UNUSED__)
 {
    Ecore_Animator *animator;
@@ -231,7 +231,7 @@ _ecore_animator(void *data __UNUSED__)
    if (!animators)
      {
 	timer = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
diff --git a/legacy/ecore/src/lib/ecore/ecore_events.c b/legacy/ecore/src/lib/ecore/ecore_events.c
index 1890719ca9..9746694859 100644
--- a/legacy/ecore/src/lib/ecore/ecore_events.c
+++ b/legacy/ecore/src/lib/ecore/ecore_events.c
@@ -18,8 +18,8 @@ struct _Ecore_Event_Handler
    EINA_INLIST;
    ECORE_MAGIC;
    int type;
-   int (*func) (void *data, int type, void *event);
-   void  *data;
+   Eina_Bool (*func) (void *data, int type, void *event);
+   void *data;
    int       references;
    Eina_Bool delete_me : 1;
 };
@@ -29,7 +29,7 @@ struct _Ecore_Event_Filter
    EINA_INLIST;
    ECORE_MAGIC;
    void *(*func_start) (void *data);
-   int (*func_filter) (void *data, void *loop_data, int type, void *event);
+   Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event);
    void (*func_end) (void *data, void *loop_data);
    void *loop_data;
    void *data;
@@ -98,7 +98,7 @@ static void *_ecore_event_del(Ecore_Event *event);
  * been called, will not be.
  */
 EAPI Ecore_Event_Handler *
-ecore_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data)
+ecore_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
 {
    Ecore_Event_Handler *eh;
 
@@ -256,7 +256,7 @@ ecore_event_type_new(void)
  * and @p data pointer to clean up.
  */
 EAPI Ecore_Event_Filter *
-ecore_event_filter_add(void * (*func_start) (void *data), int (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data)
+ecore_event_filter_add(void * (*func_start) (void *data), Eina_Bool (*func_filter) (void *data, void *loop_data, int type, void *event), void (*func_end) (void *data, void *loop_data), const void *data)
 {
    Ecore_Event_Filter *ef;
 
@@ -570,7 +570,7 @@ _ecore_event_call(void)
 		  Ecore_Event_Handler *eh = event_handler_current;
 		  if (!eh->delete_me)
 		    {
-		       int ret;
+		       Eina_Bool ret;
 
 		       handle_count++;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_exe.c b/legacy/ecore/src/lib/ecore/ecore_exe.c
index 3366fa67ff..9efa4e751d 100644
--- a/legacy/ecore/src/lib/ecore/ecore_exe.c
+++ b/legacy/ecore/src/lib/ecore/ecore_exe.c
@@ -144,15 +144,15 @@ struct _ecore_exe_dead_exe
 };
 
 static inline void _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags);
-static int _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags);
-static int _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags);
+static Eina_Bool _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler);
 static void _ecore_exe_flush(Ecore_Exe * exe);
 static void _ecore_exe_event_exe_data_free(void *data __UNUSED__, void *ev);
 static Ecore_Exe *_ecore_exe_is_it_alive(pid_t pid);
-static int _ecore_exe_make_sure_its_dead(void *data);
-static int _ecore_exe_make_sure_its_really_dead(void *data);
+static Eina_Bool _ecore_exe_make_sure_its_dead(void *data);
+static Eina_Bool _ecore_exe_make_sure_its_really_dead(void *data);
 static Ecore_Exe_Event_Add *_ecore_exe_event_add_new(void);
 static void _ecore_exe_event_add_free(void *data, void *ev);
 static void _ecore_exe_dead_attach(Ecore_Exe *exe);
@@ -744,25 +744,25 @@ ecore_exe_send(Ecore_Exe * exe, const void *data, int size)
    if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE))
      {
 	ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_send");
-	return 0;
+	return EINA_FALSE;
      }
 
    if (exe->close_stdin)
      {
 	ERR("Ecore_Exe %p stdin is closed! Cannot send %d bytes from %p",
 	    exe, size, data);
-	return 0;
+	return EINA_FALSE;
      }
 
    if (exe->child_fd_write == -1)
      {
 	ERR("Ecore_Exe %p created without ECORE_EXE_PIPE_WRITE! "
 	    "Cannot send %d bytes from %p", exe, size, data);
-	return 0;
+	return EINA_FALSE;
      }
 
    buf = realloc(exe->write_data_buf, exe->write_data_size + size);
-   if (buf == NULL) return 0;
+   if (buf == NULL) return EINA_FALSE;
 
    exe->write_data_buf = buf;
    memcpy((char *)exe->write_data_buf + exe->write_data_size, data, size);
@@ -771,7 +771,7 @@ ecore_exe_send(Ecore_Exe * exe, const void *data, int size)
    if (exe->write_fd_handler)
       ecore_main_fd_handler_active_set(exe->write_fd_handler, ECORE_FD_WRITE);
 
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
@@ -1382,7 +1382,7 @@ _ecore_exe_is_it_alive(pid_t pid)
    return exe;
 }
 
-static int
+static Eina_Bool
 _ecore_exe_make_sure_its_dead(void *data)
 {
    struct _ecore_exe_dead_exe *dead;
@@ -1411,10 +1411,10 @@ _ecore_exe_make_sure_its_dead(void *data)
 	     free(dead);
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_exe_make_sure_its_really_dead(void *data)
 {
    struct _ecore_exe_dead_exe *dead;
@@ -1436,7 +1436,7 @@ _ecore_exe_make_sure_its_really_dead(void *data)
 	IF_FREE(dead->cmd);
 	free(dead);
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 void
@@ -1575,7 +1575,7 @@ _ecore_exe_exec_it(const char *exe_cmd, Ecore_Exe_Flags flags)
    return;
 }
 
-static int
+static Eina_Bool
 _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_Exe_Flags flags)
 {
    Ecore_Exe *exe;
@@ -1700,24 +1700,24 @@ _ecore_exe_data_generic_handler(void *data, Ecore_Fd_Handler *fd_handler, Ecore_
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_exe_data_error_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    return _ecore_exe_data_generic_handler(data, fd_handler,
 					  ECORE_EXE_PIPE_ERROR);
 }
 
-static int
+static Eina_Bool
 _ecore_exe_data_read_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    return _ecore_exe_data_generic_handler(data, fd_handler,
 					  ECORE_EXE_PIPE_READ);
 }
 
-static int
+static Eina_Bool
 _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Ecore_Exe *exe;
@@ -1744,7 +1744,7 @@ _ecore_exe_data_write_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED_
 	IF_FREE(exe->write_data_buf);
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
index 2f9a5923a7..0eda1d050f 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
@@ -16,7 +16,7 @@ struct _Ecore_Idle_Enterer
 {
    EINA_INLIST;
    ECORE_MAGIC;
-   int        (*func) (void *data);
+   Eina_Bool  (*func) (void *data);
    void        *data;
    int          references;
    Eina_Bool    delete_me : 1;
@@ -36,7 +36,7 @@ static int                 idle_enterers_delete_me = 0;
  * @ingroup Idle_Group
  */
 EAPI Ecore_Idle_Enterer *
-ecore_idle_enterer_add(int (*func) (void *data), const void *data)
+ecore_idle_enterer_add(Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Idle_Enterer *ie;
 
@@ -59,7 +59,7 @@ ecore_idle_enterer_add(int (*func) (void *data), const void *data)
  * @ingroup Idle_Group
  */
 EAPI Ecore_Idle_Enterer *
-ecore_idle_enterer_before_add(int (*func) (void *data), const void *data)
+ecore_idle_enterer_before_add(Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Idle_Enterer *ie;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
index 1d5c6ce04d..9b8231fca7 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
@@ -16,7 +16,7 @@ struct _Ecore_Idle_Exiter
 {
    EINA_INLIST;
    ECORE_MAGIC;
-   int        (*func) (void *data);
+   Eina_Bool  (*func) (void *data);
    void        *data;
    int          references;
    Eina_Bool    delete_me : 1;
@@ -35,7 +35,7 @@ static int                idle_exiters_delete_me = 0;
  * @ingroup Idle_Group
  */
 EAPI Ecore_Idle_Exiter *
-ecore_idle_exiter_add(int (*func) (void *data), const void *data)
+ecore_idle_exiter_add(Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Idle_Exiter *ie;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_idler.c b/legacy/ecore/src/lib/ecore/ecore_idler.c
index 6df9ad0a50..e3269c3753 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idler.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idler.c
@@ -16,7 +16,7 @@ struct _Ecore_Idler
 {
    EINA_INLIST;
    ECORE_MAGIC;
-   int        (*func) (void *data);
+   Eina_Bool  (*func) (void *data);
    void        *data;
    int          references;
    Eina_Bool    delete_me : 1;
@@ -43,7 +43,7 @@ static int          idlers_delete_me = 0;
  * Idlers are useful for progressively prossessing data without blocking.
  */
 EAPI Ecore_Idler *
-ecore_idler_add(int (*func) (void *data), const void *data)
+ecore_idler_add(Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Idler *ie;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_job.c b/legacy/ecore/src/lib/ecore/ecore_job.c
index 0557a696d5..b55a8b22c6 100644
--- a/legacy/ecore/src/lib/ecore/ecore_job.c
+++ b/legacy/ecore/src/lib/ecore/ecore_job.c
@@ -11,7 +11,7 @@
 #include "Ecore.h"
 #include "ecore_private.h"
 
-static int _ecore_job_event_handler(void *data, int type, void *ev);
+static Eina_Bool _ecore_job_event_handler(void *data, int type, void *ev);
 static void _ecore_job_event_free(void *data, void *ev);
 
 static int ecore_event_job_type = 0;
@@ -93,14 +93,14 @@ ecore_job_del(Ecore_Job *job)
    return data;
 }
 
-static int
+static Eina_Bool
 _ecore_job_event_handler(void *data __UNUSED__, int type __UNUSED__, void *ev)
 {
    Ecore_Job *job;
    
    job = ev;
    job->func(job->data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index 61e7636244..efa985d0df 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -59,9 +59,9 @@ struct _Ecore_Fd_Handler
    ECORE_MAGIC;
    int                      fd;
    Ecore_Fd_Handler_Flags   flags;
-   int                    (*func) (void *data, Ecore_Fd_Handler *fd_handler);
+   Eina_Bool              (*func) (void *data, Ecore_Fd_Handler *fd_handler);
    void                    *data;
-   int                    (*buf_func) (void *data, Ecore_Fd_Handler *fd_handler);
+   Eina_Bool              (*buf_func) (void *data, Ecore_Fd_Handler *fd_handler);
    void                    *buf_data;
    void                   (*prep_func) (void *data, Ecore_Fd_Handler *fd_handler);
    void                    *prep_data;
@@ -78,7 +78,7 @@ struct _Ecore_Win32_Handler
    EINA_INLIST;
    ECORE_MAGIC;
    HANDLE         h;
-   int          (*func) (void *data, Ecore_Win32_Handler *win32_handler);
+   Eina_Bool    (*func) (void *data, Ecore_Win32_Handler *win32_handler);
    void          *data;
    int            references;
    Eina_Bool      delete_me : 1;
@@ -249,7 +249,9 @@ ecore_main_loop_select_func_get(void)
  * @ingroup Ecore_FD_Handler_Group
  */
 EAPI Ecore_Fd_Handler *
-ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data, int (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data)
+ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags,
+			  Eina_Bool (*func) (void *data, Ecore_Fd_Handler *fd_handler), const void *data,
+			  Eina_Bool (*buf_func) (void *buf_data, Ecore_Fd_Handler *fd_handler), const void *buf_data)
 {
    Ecore_Fd_Handler *fdh;
 
@@ -277,7 +279,7 @@ ecore_main_fd_handler_add(int fd, Ecore_Fd_Handler_Flags flags, int (*func) (voi
 #ifdef _WIN32
 EAPI Ecore_Win32_Handler *
 ecore_main_win32_handler_add(void *h,
-                             int (*func) (void *data, Ecore_Win32_Handler *wh),
+                             Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh),
                              const void *data)
 {
    Ecore_Win32_Handler *wh;
@@ -299,7 +301,7 @@ ecore_main_win32_handler_add(void *h,
 #else
 EAPI Ecore_Win32_Handler *
 ecore_main_win32_handler_add(void *h __UNUSED__,
-                             int (*func) (void *data, Ecore_Win32_Handler *wh) __UNUSED__,
+                             Eina_Bool (*func) (void *data, Ecore_Win32_Handler *wh) __UNUSED__,
                              const void *data __UNUSED__)
 {
    return NULL;
diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c
index 7a39d3d099..a6902eac95 100644
--- a/legacy/ecore/src/lib/ecore/ecore_pipe.c
+++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c
@@ -66,7 +66,7 @@ struct _Ecore_Pipe
 };
 
 
-static int _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler);
 
 /**
  * @defgroup Ecore_Pipe_Group Pipe wrapper
@@ -474,7 +474,7 @@ ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes)
 
 /* Private function */
 
-static int
+static Eina_Bool
 _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Ecore_Pipe  *p;
diff --git a/legacy/ecore/src/lib/ecore/ecore_poll.c b/legacy/ecore/src/lib/ecore/ecore_poll.c
index dd1528aeb0..078388b2be 100644
--- a/legacy/ecore/src/lib/ecore/ecore_poll.c
+++ b/legacy/ecore/src/lib/ecore/ecore_poll.c
@@ -18,7 +18,7 @@ struct _Ecore_Poller
    ECORE_MAGIC;
    int           ibit;
    unsigned char delete_me : 1;
-   int           (*func) (void *data);
+   Eina_Bool    (*func) (void *data);
    void          *data;
 };
 
@@ -45,7 +45,7 @@ static unsigned short  poller_counters[16] =
 };
 
 static void _ecore_poller_next_tick_eval(void);
-static int _ecore_poller_cb_timer(void *data);
+static Eina_Bool _ecore_poller_cb_timer(void *data);
 
 static void
 _ecore_poller_next_tick_eval(void)
@@ -106,7 +106,7 @@ _ecore_poller_next_tick_eval(void)
    poll_cur_interval = interval;
 }
 
-static int
+static Eina_Bool
 _ecore_poller_cb_timer(void *data __UNUSED__)
 {
    int i;
@@ -187,11 +187,11 @@ _ecore_poller_cb_timer(void *data __UNUSED__)
    /* if the timer was deleted then there is no point returning 1 - ambiguous
     * if we do as it im plies "keep running me" but we have been deleted
     * anyway */
-   if (!timer) return 0;
+   if (!timer) return ECORE_CALLBACK_CANCEL;
 
    /* adjust interval */
    ecore_timer_interval_set(timer, poll_cur_interval);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /**
@@ -282,7 +282,7 @@ ecore_poller_poll_interval_get(Ecore_Poller_Type type __UNUSED__)
  * invalid.
  */
 EAPI Ecore_Poller *
-ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, int (*func) (void *data), const void *data)
+ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, Eina_Bool (*func) (void *data), const void *data)
 {
    Ecore_Poller *poller;
    int ibit;
@@ -326,7 +326,7 @@ ecore_poller_add(Ecore_Poller_Type type __UNUSED__, int interval, int (*func) (v
  * a poll rate without deleting and re-creating a poller.
  * @ingroup Ecore_Poller_Group
  */
-EAPI Eina_Bool 
+EAPI Eina_Bool
 ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
 {
    int ibit;
@@ -335,7 +335,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
      {
         ECORE_MAGIC_FAIL(poller, ECORE_MAGIC_POLLER,
            "ecore_poller_poller_interval_set");
-        return 0;
+        return EINA_FALSE;
      }
 
    /* interval MUST be a power of 2, so enforce it */
@@ -350,7 +350,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
    if (ibit > 15) ibit = 15;
    /* if interval specified is the same as interval set, return true without wasting time */
    if (poller->ibit == ibit)
-     return 1;
+     return EINA_TRUE;
    pollers[poller->ibit] = (Ecore_Poller *) eina_inlist_remove(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
    poller->ibit = ibit;
    pollers[poller->ibit] = (Ecore_Poller *) eina_inlist_prepend(EINA_INLIST_GET(pollers[poller->ibit]), EINA_INLIST_GET(poller));
@@ -358,7 +358,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
      just_added_poller++;
    else
      _ecore_poller_next_tick_eval();
-   return 1;
+   return EINA_TRUE;
 }
 
 /**
diff --git a/legacy/ecore/src/lib/ecore/ecore_signal.c b/legacy/ecore/src/lib/ecore/ecore_signal.c
index 5d0ddb51e9..3b8c51bbfb 100644
--- a/legacy/ecore/src/lib/ecore/ecore_signal.c
+++ b/legacy/ecore/src/lib/ecore/ecore_signal.c
@@ -40,7 +40,7 @@ static void _ecore_signal_callback_sigpwr(int sig, siginfo_t *si, void *foo);
 static void _ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo);
 #endif
 
-static int _ecore_signal_exe_exit_delay(void *data);
+static Eina_Bool _ecore_signal_exe_exit_delay(void *data);
 
 //#define MAXSIGQ 256 // 32k
 #define MAXSIGQ 64 // 8k
@@ -608,7 +608,7 @@ _ecore_signal_callback_sigrt(int sig, siginfo_t *si, void *foo __UNUSED__)
 }
 #endif
 
-static int
+static Eina_Bool
 _ecore_signal_exe_exit_delay(void *data)
 {
    Ecore_Exe_Event_Del *e;
@@ -620,5 +620,5 @@ _ecore_signal_exe_exit_delay(void *data)
 	_ecore_event_add(ECORE_EXE_EVENT_DEL, e,
 			 _ecore_exe_event_del_free, NULL);
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/legacy/ecore/src/lib/ecore/ecore_thread.c
index 8c62db4798..561d0ccce4 100644
--- a/legacy/ecore/src/lib/ecore/ecore_thread.c
+++ b/legacy/ecore/src/lib/ecore/ecore_thread.c
@@ -55,11 +55,11 @@ _ecore_thread_pipe_free(void *data __UNUSED__, void *event)
    ecore_pipe_del(p);
 }
 
-static int
+static Eina_Bool
 _ecore_thread_pipe_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    /* This is a hack to delay pipe destruction until we are out of it's internal loop. */
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore/ecore_timer.c b/legacy/ecore/src/lib/ecore/ecore_timer.c
index 995d6c2997..9a49675f92 100644
--- a/legacy/ecore/src/lib/ecore/ecore_timer.c
+++ b/legacy/ecore/src/lib/ecore/ecore_timer.c
@@ -20,7 +20,7 @@ struct _Ecore_Timer
    double          in;
    double          at;
    double          pending;
-   int           (*func) (void *data);
+   Eina_Bool     (*func) (void *data);
    void           *data;
 
    int             references;
@@ -30,7 +30,7 @@ struct _Ecore_Timer
 };
 
 
-static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data), void *data);
+static void _ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data);
 
 static int          timers_added = 0;
 static int          timers_delete_me = 0;
@@ -113,7 +113,7 @@ ecore_timer_precision_set(double value)
  * invalid.
  */
 EAPI Ecore_Timer *
-ecore_timer_add(double in, int (*func) (void *data), const void *data)
+ecore_timer_add(double in, Eina_Bool (*func) (void *data), const void *data)
 {
    double now;
    Ecore_Timer *timer;
@@ -142,7 +142,7 @@ ecore_timer_add(double in, int (*func) (void *data), const void *data)
  * ecore_timer_add() for more details.
  */
 EAPI Ecore_Timer *
-ecore_timer_loop_add(double in, int (*func) (void *data), const void *data)
+ecore_timer_loop_add(double in, Eina_Bool (*func) (void *data), const void *data)
 {
    double now;
    Ecore_Timer *timer;
@@ -561,7 +561,7 @@ _ecore_timer_call(double when)
 }
 
 static void
-_ecore_timer_set(Ecore_Timer *timer, double at, double in, int (*func) (void *data), void *data)
+_ecore_timer_set(Ecore_Timer *timer, double at, double in, Eina_Bool (*func) (void *data), void *data)
 {
    Ecore_Timer *t2;
 
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 627c8cd80a..265e0f1758 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -55,11 +55,11 @@ static void _ecore_con_cb_udp_listen(void *data, Ecore_Con_Info *info);
 static void _ecore_con_server_free(Ecore_Con_Server *svr);
 static void _ecore_con_client_free(Ecore_Con_Client *cl);
 
-static int _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler);
 
 static void _ecore_con_server_flush(Ecore_Con_Server *svr);
 static void _ecore_con_client_flush(Ecore_Con_Client *cl);
@@ -1121,7 +1121,7 @@ _ecore_con_pretty_ip(struct sockaddr *client_addr, socklen_t size)
    return strdup(ipbuf);
 }
 
-static int
+static Eina_Bool
 _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Ecore_Con_Server   *svr;
@@ -1130,12 +1130,12 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
    size_t              size_in;
 
    svr = data;
-   if (svr->dead) return 1;
-   if (svr->delete_me) return 1;
+   if (svr->dead) return ECORE_CALLBACK_RENEW;
+   if (svr->delete_me) return ECORE_CALLBACK_RENEW;
    if ((svr->client_limit >= 0) && (!svr->reject_excess_clients))
      {
 	if (eina_list_count(svr->clients) >= (unsigned int)svr->client_limit)
-	  return 1;
+	  return ECORE_CALLBACK_RENEW;
      }
    /* a new client */
    size_in = sizeof(incoming);
@@ -1151,7 +1151,7 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 	    if (eina_list_count(svr->clients) >= (unsigned int)svr->client_limit)
 	      {
 		close(new_fd);
-		return 1;
+		return ECORE_CALLBACK_RENEW;
 	      }
 	  }
 
@@ -1159,7 +1159,7 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 	if (!cl)
 	  {
 	     close(new_fd);
-	     return 1;
+	     return ECORE_CALLBACK_RENEW;
 	  }
 
 	fcntl(new_fd, F_SETFL, O_NONBLOCK);
@@ -1172,7 +1172,7 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 	  {
 	    close(new_fd);
 	    ecore_con_ssl_client_shutdown(cl);
-	    return 1;
+	    return ECORE_CALLBACK_RENEW;
 	  }
 
 	cl->fd_handler =
@@ -1196,17 +1196,17 @@ _ecore_con_svr_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    Ecore_Con_Server   *svr;
 
    svr = data;
-   if (svr->dead) return 1;
-   if (svr->delete_me) return 1;
+   if (svr->dead) return ECORE_CALLBACK_RENEW;
+   if (svr->delete_me) return ECORE_CALLBACK_RENEW;
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      {
 	unsigned char *inbuf = NULL;
@@ -1214,7 +1214,7 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
         int            tries;
 
 	if (svr->connecting && (svr_try_connect(svr) != ECORE_CON_CONNECTED))
-	   return 1;
+	   return ECORE_CALLBACK_RENEW;
 
 	for (tries = 0; tries < 16; tries++)
 	  {
@@ -1273,21 +1273,21 @@ _ecore_con_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
    else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
      {
 	if (svr->connecting && !svr_try_connect (svr))
-	   return 1;
+	   return ECORE_CALLBACK_RENEW;
 	_ecore_con_server_flush(svr);
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    Ecore_Con_Server   *svr;
 
    svr = data;
-   if (svr->dead) return 1;
-   if (svr->delete_me) return 1;
+   if (svr->dead) return ECORE_CALLBACK_RENEW;
+   if (svr->delete_me) return ECORE_CALLBACK_RENEW;
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      {
        unsigned char buf[65536];
@@ -1333,18 +1333,18 @@ _ecore_con_cl_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
    else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
        _ecore_con_server_flush(svr);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    Ecore_Con_Server   *svr;
    Ecore_Con_Client *cl = NULL;
 
    svr = data;
-   if (svr->dead) return 1;
-   if (svr->delete_me) return 1;
+   if (svr->dead) return ECORE_CALLBACK_RENEW;
+   if (svr->delete_me) return ECORE_CALLBACK_RENEW;
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      {
        unsigned char buf[READBUFSIZ];
@@ -1371,7 +1371,7 @@ _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
 	       /* Create a new client for use in the client data event */
 	       cl = calloc(1, sizeof(Ecore_Con_Client));
 	       if(cl == NULL)
-		 return 1;
+		 return ECORE_CALLBACK_RENEW;
 	       cl->buf = NULL;
 	       cl->fd = 0;
 	       cl->fd_handler = NULL;
@@ -1381,7 +1381,7 @@ _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
 	       if(cl->client_addr == NULL)
 		 {
 		   free(cl);
-		   return 1;
+		   return ECORE_CALLBACK_RENEW;
 		 }
 	       memcpy(cl->client_addr, &client_addr, client_addr_len);
 	       ECORE_MAGIC_SET(cl, ECORE_MAGIC_CON_CLIENT);
@@ -1394,7 +1394,7 @@ _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
 		 {
 		   free(cl->client_addr);
 		   free(cl);
-		   return 1;
+		   return ECORE_CALLBACK_RENEW;
 		 }
 
 	       memcpy(inbuf, buf, num);
@@ -1456,17 +1456,17 @@ _ecore_con_svr_udp_handler(void *data, Ecore_Fd_Handler *fd_handler)
      }
    else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
      _ecore_con_client_flush(cl);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    Ecore_Con_Client   *cl;
 
    cl = data;
-   if (cl->dead) return 1;
-   if (cl->delete_me) return 1;
+   if (cl->dead) return ECORE_CALLBACK_RENEW;
+   if (cl->delete_me) return ECORE_CALLBACK_RENEW;
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
      {
 	unsigned char *inbuf = NULL;
@@ -1545,7 +1545,7 @@ _ecore_con_svr_cl_handler(void *data, Ecore_Fd_Handler *fd_handler)
      }
    else if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
      _ecore_con_client_flush(cl);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c
index acc1e9c5d5..c9f7382661 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c
@@ -53,8 +53,8 @@ static fd_set info_readers, info_writers;
 
 static void _ecore_con_info_ares_nameinfo(Ecore_Con_CAres *arg, int status, int timeouts, char *node, char *service);
 static void _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, int status, int timeouts, struct hostent *hostent);
-static int _ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_info_cares_timeout_cb(void *data);
+static Eina_Bool _ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_info_cares_timeout_cb(void *data);
 static void _ecore_con_info_cares_clean(void);
 
 int
@@ -367,22 +367,22 @@ _ecore_con_info_cares_clean(void)
      }
 }
 
-static int
+static Eina_Bool
 _ecore_con_info_cares_timeout_cb(void *data)
 {
    ares_process(info_channel, &info_readers, &info_writers);
    _ecore_con_info_cares_clean();
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_info_cares_fd_cb(void *data, Ecore_Fd_Handler *fd_handler)
 {
    ares_process(info_channel, &info_readers, &info_writers);
    _ecore_con_info_cares_clean();
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c
index 4a0ff99a81..810f83cbbf 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_info.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_info.c
@@ -78,8 +78,8 @@ struct _CB_Data
 
 static void _ecore_con_info_readdata(CB_Data *cbdata);
 static void _ecore_con_info_slave_free(CB_Data *cbdata);
-static int _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event);
 
 static int info_init = 0;
 static CB_Data *info_slaves = NULL;
@@ -348,7 +348,7 @@ _ecore_con_info_slave_free(CB_Data *cbdata)
    free(cbdata);
 }
 
-static int
+static Eina_Bool
 _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    CB_Data *cbdata;
@@ -365,10 +365,10 @@ _ecore_con_info_data_handler(void *data, Ecore_Fd_Handler *fd_handler)
 	  }
      }
    _ecore_con_info_slave_free(cbdata);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event)
 {
    CB_Data *cbdata;
@@ -376,8 +376,8 @@ _ecore_con_info_exit_handler(void *data, int type __UNUSED__, void *event)
 
    ev = event;
    cbdata = data;
-   if (cbdata->pid != ev->pid) return 1;
-   return 0;
+   if (cbdata->pid != ev->pid) return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_CANCEL; /* FIXME: Woot ??? */
    _ecore_con_info_slave_free(cbdata);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_local.c b/legacy/ecore/src/lib/ecore_con/ecore_con_local.c
index 20cb224752..c79fe5e98f 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_local.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_local.c
@@ -62,7 +62,7 @@ ecore_con_local_shutdown(void)
 
 int
 ecore_con_local_connect(Ecore_Con_Server *svr,
-			int (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
+			Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler),
 			void *data __UNUSED__,
 			void (*cb_free)(void *data, void *ev))
 {
@@ -157,7 +157,7 @@ ecore_con_local_connect(Ecore_Con_Server *svr,
 
 int
 ecore_con_local_listen(Ecore_Con_Server *svr,
-		       int (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler),
+		       Eina_Bool (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler),
 		       void *data __UNUSED__)
 {
    char               buf[4096];
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
index ce106fab58..b07fe2d506 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
@@ -166,8 +166,8 @@ struct _Ecore_Con_Info
 /* from ecore_local.c */
 int ecore_con_local_init(void);
 int ecore_con_local_shutdown(void);
-int ecore_con_local_connect(Ecore_Con_Server *svr, int (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler), void *data, void (*cb_free)(void *data, void *ev));
-int ecore_con_local_listen(Ecore_Con_Server *svr, int (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler), void *data);
+int ecore_con_local_connect(Ecore_Con_Server *svr, Eina_Bool (*cb_done)(void *data, Ecore_Fd_Handler *fd_handler), void *data, void (*cb_free)(void *data, void *ev));
+int ecore_con_local_listen(Ecore_Con_Server *svr, Eina_Bool (*cb_listen)(void *data, Ecore_Fd_Handler *fd_handler), void *data);
 /* from ecore_con_info.c */
 int ecore_con_info_init(void);
 int ecore_con_info_shutdown(void);
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
index 45909390a7..e3f4a8790d 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
@@ -76,7 +76,7 @@ int ECORE_CON_EVENT_URL_COMPLETE = 0;
 int ECORE_CON_EVENT_URL_PROGRESS = 0;
 
 #ifdef HAVE_CURL
-static int _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
 static int _ecore_con_url_perform(Ecore_Con_Url *url_con);
 static size_t _ecore_con_url_header_cb(void *ptr, size_t size, size_t nitems, void *stream);
 static size_t _ecore_con_url_data_cb(void *buffer, size_t size, size_t nitems, void *userp);
@@ -84,7 +84,7 @@ static int _ecore_con_url_progress_cb(void *clientp, double dltotal, double dlno
 static size_t _ecore_con_url_read_cb(void *ptr, size_t size, size_t nitems, void *stream);
 static void _ecore_con_event_url_free(void *data __UNUSED__, void *ev);
 static int _ecore_con_url_process_completed_jobs(Ecore_Con_Url *url_con_to_match);
-static int _ecore_con_url_idler_handler(void *data __UNUSED__);
+static Eina_Bool _ecore_con_url_idler_handler(void *data __UNUSED__);
 
 static Ecore_Idler *_fd_idler_handler = NULL;
 static Eina_List *_url_con_list = NULL;
@@ -100,7 +100,7 @@ struct _Ecore_Con_Url_Event
    void  *ev;
 };
 
-static int
+static Eina_Bool
 _url_complete_idler_cb(void *data)
 {
    Ecore_Con_Url_Event *lev;
@@ -109,7 +109,7 @@ _url_complete_idler_cb(void *data)
    ecore_event_add(lev->type, lev->ev, _ecore_con_event_url_free, NULL);
    free(lev);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1195,7 +1195,7 @@ _ecore_con_url_perform(Ecore_Con_Url *url_con)
    return 1;
 }
 
-static int
+static Eina_Bool
 _ecore_con_url_idler_handler(void *data)
 {
    double start;
@@ -1219,13 +1219,13 @@ _ecore_con_url_idler_handler(void *data)
 
 	if (!_url_con_list)
 	  ecore_timer_freeze(_curl_timeout);
-	return data == (void*) 0xACE ? 1 : 0;
+	return data == (void*) 0xACE ? ECORE_CALLBACK_RENEW : ECORE_CALLBACK_CANCEL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    _ecore_con_url_suspend_fd_handler();
@@ -1233,7 +1233,7 @@ _ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __
    if (_fd_idler_handler == NULL)
      _fd_idler_handler = ecore_idler_add(_ecore_con_url_idler_handler, NULL);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static int
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index a21213672e..b1a4eac0e2 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -24,13 +24,13 @@
 int _ecore_evas_log_dom = -1;
 static int _ecore_evas_init_count = 0;
 static Ecore_Fd_Handler *_ecore_evas_async_events_fd = NULL;
-static int _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_evas_async_events_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
 
 static Ecore_Idle_Enterer *ecore_evas_idle_enterer = NULL;
 static Ecore_Evas *ecore_evases = NULL;
 static int _ecore_evas_fps_debug = 0;
 
-static int
+static Eina_Bool
 _ecore_evas_idle_enter(void *data __UNUSED__)
 {
    Ecore_Evas *ee;
@@ -38,7 +38,7 @@ _ecore_evas_idle_enter(void *data __UNUSED__)
    double t2 = 0.0;
    int rend = 0;
    
-   if (!ecore_evases) return 1;
+   if (!ecore_evases) return ECORE_CALLBACK_RENEW;
    if (_ecore_evas_fps_debug)
      {
         t1 = ecore_time_get();
@@ -57,7 +57,7 @@ _ecore_evas_idle_enter(void *data __UNUSED__)
         if (rend)
           _ecore_evas_fps_debug_rendertime_add(t2 - t1);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /**
@@ -2794,7 +2794,7 @@ _ecore_evas_free(Ecore_Evas *ee)
    free(ee);
 }
 
-static int
+static Eina_Bool
 _ecore_evas_cb_idle_flush(void *data)
 {
    Ecore_Evas *ee;
@@ -2802,15 +2802,15 @@ _ecore_evas_cb_idle_flush(void *data)
    ee = (Ecore_Evas *)data;
    evas_render_idle_flush(ee->evas);
    ee->engine.idle_flush_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_async_events_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    evas_async_events_process();
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 void
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
index 153c87ea42..427c63950d 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c
@@ -47,35 +47,35 @@ _ecore_evas_sdl_match(void)
    return sdl_ee;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_sdl_event_got_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Ecore_Evas                   *ee;
 
    ee = _ecore_evas_sdl_match();
 
-   if (!ee) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
    ee->prop.focused = 1;
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_sdl_event_lost_focus(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Ecore_Evas                   *ee;
 
    ee = _ecore_evas_sdl_match();
 
-   if (!ee) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
    ee->prop.focused = 0;
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_sdl_event_video_resize(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Sdl_Event_Video_Resize *e;
@@ -84,13 +84,13 @@ _ecore_evas_sdl_event_video_resize(void *data __UNUSED__, int type __UNUSED__, v
    e = event;
    ee = _ecore_evas_sdl_match();
 
-   if (!ee) return 1; /* pass on event */
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
    evas_output_size_set(ee->evas, e->w, e->h);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_sdl_event_video_expose(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    Ecore_Evas                   *ee;
@@ -99,11 +99,11 @@ _ecore_evas_sdl_event_video_expose(void *data __UNUSED__, int type __UNUSED__, v
 
    ee = _ecore_evas_sdl_match();
 
-   if (!ee) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON;
    evas_output_size_get(ee->evas, &w, &h);
    evas_damage_rectangle_add(ee->evas, 0, 0, w, h);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 static int
@@ -151,11 +151,11 @@ _ecore_evas_sdl_render(Ecore_Evas *ee)
    return rend;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_sdl_event(void *data __UNUSED__)
 {
    ecore_sdl_feed_events();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static int
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index c322f65b89..fe754590d6 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -497,7 +497,7 @@ _ecore_evas_x_resize_shape(Ecore_Evas *ee)
 }
 
 /* TODO: we need to make this work for all the states, not just sticky */
-static int
+static Eina_Bool
 _ecore_evas_x_event_property_change(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -505,8 +505,8 @@ _ecore_evas_x_event_property_change(void *data __UNUSED__, int type __UNUSED__,
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
    if (e->atom == ECORE_X_ATOM_NET_WM_STATE)
      {
 	unsigned int i, num;
@@ -595,10 +595,10 @@ _ecore_evas_x_event_property_change(void *data __UNUSED__, int type __UNUSED__,
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_visibility_change(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -606,8 +606,8 @@ _ecore_evas_x_event_visibility_change(void *data __UNUSED__, int type __UNUSED__
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 //   printf("VIS CHANGE OBSCURED: %p %i\n", ee, e->fully_obscured);
    if (e->fully_obscured)
      {
@@ -616,45 +616,45 @@ _ecore_evas_x_event_visibility_change(void *data __UNUSED__, int type __UNUSED__
           ee->draw_ok = 0;
      }
    else ee->draw_ok = 1;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_client_message(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
    Ecore_X_Event_Client_Message *e;
 
    e = event;
-   if (e->format != 32) return 1;
+   if (e->format != 32) return ECORE_CALLBACK_PASS_ON;
    if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_BEGIN)
      {
         ee = ecore_event_window_match(e->data.l[0]);
-        if (!ee) return 1; /* pass on event */
-        if (e->data.l[0] != (long)ee->prop.window) return 1;
+        if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+        if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
         ee->engine.x.sync_began = 1;
         ee->engine.x.sync_cancel = 0;
      }
    else if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_END)
      {
         ee = ecore_event_window_match(e->data.l[0]);
-        if (!ee) return 1; /* pass on event */
-        if (e->data.l[0] != (long)ee->prop.window) return 1;
+        if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+        if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
         ee->engine.x.sync_began = 0;
         ee->engine.x.sync_cancel = 0;
      }
    else if (e->message_type == ECORE_X_ATOM_E_COMP_SYNC_CANCEL)
      {
         ee = ecore_event_window_match(e->data.l[0]);
-        if (!ee) return 1; /* pass on event */
-        if (e->data.l[0] != (long)ee->prop.window) return 1;
+        if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+        if (e->data.l[0] != (long)ee->prop.window) return ECORE_CALLBACK_PASS_ON;
         ee->engine.x.sync_began = 0;
         ee->engine.x.sync_cancel = 1;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -662,8 +662,8 @@ _ecore_evas_x_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *e
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 /*    { */
 /*       time_t t; */
 /*       char *ct; */
@@ -702,10 +702,10 @@ _ecore_evas_x_event_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *e
    ecore_event_evas_modifier_lock_update(ee->evas, e->modifiers);
    evas_event_feed_mouse_in(ee->evas, e->time, NULL);
    _ecore_evas_mouse_move_process(ee, e->x, e->y, e->time);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -713,9 +713,9 @@ _ecore_evas_x_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if ((!ee) || (ee->ignore_events)) return 1;
+   if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
    /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
 /*    { */
 /*       time_t t; */
 /*       char *ct; */
@@ -757,10 +757,10 @@ _ecore_evas_x_event_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *
    evas_event_feed_mouse_out(ee->evas, e->time, NULL);
    if (ee->func.fn_mouse_out) ee->func.fn_mouse_out(ee);
    if (ee->prop.cursor.object) evas_object_hide(ee->prop.cursor.object);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -768,16 +768,16 @@ _ecore_evas_x_event_window_focus_in(void *data __UNUSED__, int type __UNUSED__,
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return 1;
+   if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (e->mode == ECORE_X_EVENT_MODE_UNGRAB) return ECORE_CALLBACK_PASS_ON;
    ee->prop.focused = 1;
    evas_focus_in(ee->evas);
    if (ee->func.fn_focus_in) ee->func.fn_focus_in(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -785,18 +785,18 @@ _ecore_evas_x_event_window_focus_out(void *data __UNUSED__, int type __UNUSED__,
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if ((!ee) || (ee->ignore_events)) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (e->mode == ECORE_X_EVENT_MODE_GRAB) return 1;
+   if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (e->mode == ECORE_X_EVENT_MODE_GRAB) return ECORE_CALLBACK_PASS_ON;
 //   if (ee->prop.fullscreen)
 //     ecore_x_window_focus(ee->prop.window);
    evas_focus_out(ee->evas);
    ee->prop.focused = 0;
    if (ee->func.fn_focus_out) ee->func.fn_focus_out(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_damage(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -804,9 +804,9 @@ _ecore_evas_x_event_window_damage(void *data __UNUSED__, int type __UNUSED__, vo
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (ee->engine.x.using_bg_pixmap) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (ee->engine.x.using_bg_pixmap) return ECORE_CALLBACK_PASS_ON;
 //   printf("EXPOSE %p [%i] %i %i %ix%i\n", ee, ee->prop.avoid_damage, e->x, e->y, e->w, e->h);
    if (ee->prop.avoid_damage)
      {
@@ -861,10 +861,10 @@ _ecore_evas_x_event_window_damage(void *data __UNUSED__, int type __UNUSED__, vo
 				    ee->w - e->x - e->w,
 				    e->h, e->w);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -872,15 +872,15 @@ _ecore_evas_x_event_window_destroy(void *data __UNUSED__, int type __UNUSED__, v
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
    if (ee->func.fn_destroy) ee->func.fn_destroy(ee);
    _ecore_evas_x_sync_clear(ee);
    ecore_evas_free(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_configure(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -888,9 +888,9 @@ _ecore_evas_x_event_window_configure(void *data __UNUSED__, int type __UNUSED__,
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (ee->engine.x.direct_resize) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (ee->engine.x.direct_resize) return ECORE_CALLBACK_PASS_ON;
 
    if ((e->from_wm) || (ee->prop.override))
      {
@@ -941,10 +941,10 @@ _ecore_evas_x_event_window_configure(void *data __UNUSED__, int type __UNUSED__,
 	  }
 	if (ee->func.fn_resize) ee->func.fn_resize(ee);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_delete_request(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -952,13 +952,13 @@ _ecore_evas_x_event_window_delete_request(void *data __UNUSED__, int type __UNUS
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
    if (ee->func.fn_delete_request) ee->func.fn_delete_request(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_show(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -966,16 +966,16 @@ _ecore_evas_x_event_window_show(void *data __UNUSED__, int type __UNUSED__, void
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (ee->visible) return 0; /* dont pass it on */
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (ee->visible) return ECORE_CALLBACK_DONE; /* dont pass it on */
 //   printf("SHOW EVENT %p\n", ee);
    ee->visible = 1;
    if (ee->func.fn_show) ee->func.fn_show(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ecore_evas_x_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Evas *ee;
@@ -983,13 +983,13 @@ _ecore_evas_x_event_window_hide(void *data __UNUSED__, int type __UNUSED__, void
 
    e = event;
    ee = ecore_event_window_match(e->win);
-   if (!ee) return 1; /* pass on event */
-   if (e->win != ee->prop.window) return 1;
-   if (!ee->visible) return 0; /* dont pass it on */
+   if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */
+   if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
+   if (!ee->visible) return ECORE_CALLBACK_DONE; /* dont pass it on */
 //   printf("HIDE EVENT %p\n", ee);
    ee->visible = 0;
    if (ee->func.fn_hide) ee->func.fn_hide(ee);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /* FIXME, should be in idler */
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
index 70fdc680e5..0210563a64 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
@@ -41,8 +41,8 @@ Ecore_File_Download_Job *_ecore_file_download_curl(const char *url, const char *
 						   int (*progress_cb)(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow),
 						   void *data);
 
-static int _ecore_file_download_url_complete_cb(void *data, int type, void *event);
-static int _ecore_file_download_url_progress_cb(void *data, int type, void *event);
+static Eina_Bool _ecore_file_download_url_complete_cb(void *data, int type, void *event);
+static Eina_Bool _ecore_file_download_url_progress_cb(void *data, int type, void *event);
 #endif
 
 static Ecore_Event_Handler	*_url_complete_handler = NULL;
@@ -201,15 +201,14 @@ _ecore_file_download_url_compare_job(const void *data1, const void *data2)
    return -1;
 }
 
-static int
+static Eina_Bool
 _ecore_file_download_url_complete_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Con_Event_Url_Complete	*ev = event;
    Ecore_File_Download_Job	*job;
 
    job = eina_list_search_unsorted(_job_list, _ecore_file_download_url_compare_job, ev->url_con);
-   if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return 1;
-
+   if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return ECORE_CALLBACK_PASS_ON;
 
    if (job->completion_cb)
      job->completion_cb(ecore_con_url_data_get(job->url_con), job->dst, !ev->status);
@@ -219,10 +218,10 @@ _ecore_file_download_url_complete_cb(void *data __UNUSED__, int type __UNUSED__,
    free(job->dst);
    free(job);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
+static Eina_Bool
 _ecore_file_download_url_progress_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
 /* this reports the downloads progress. if we return 0, then download
@@ -231,7 +230,7 @@ _ecore_file_download_url_progress_cb(void *data __UNUSED__, int type __UNUSED__,
    Ecore_File_Download_Job	*job;
 
    job = eina_list_search_unsorted(_job_list, _ecore_file_download_url_compare_job, ev->url_con);
-   if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return 1;
+   if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_FILE_DOWNLOAD_JOB)) return ECORE_CALLBACK_PASS_ON;
 
    if (job->progress_cb)
      if (job->progress_cb(ecore_con_url_data_get(job->url_con), job->dst,
@@ -243,10 +242,10 @@ _ecore_file_download_url_progress_cb(void *data __UNUSED__, int type __UNUSED__,
 	  free(job->dst);
 	  free(job);
 
-	  return 1;
+	  return ECORE_CALLBACK_PASS_ON;
        }
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 Ecore_File_Download_Job *
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c
index bc2c111530..5b912be8d2 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c
@@ -51,7 +51,7 @@ struct _Ecore_File_Monitor_Inotify
 static Ecore_Fd_Handler *_fdh = NULL;
 static Ecore_File_Monitor    *_monitors = NULL;
 
-static int                 _ecore_file_monitor_inotify_handler(void *data, Ecore_Fd_Handler *fdh);
+static Eina_Bool           _ecore_file_monitor_inotify_handler(void *data, Ecore_Fd_Handler *fdh);
 static Ecore_File_Monitor *_ecore_file_monitor_inotify_monitor_find(int wd);
 static void                _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask);
 static int                 _ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path);
@@ -147,7 +147,7 @@ ecore_file_monitor_inotify_del(Ecore_File_Monitor *em)
    free(em);
 }
 
-static int
+static Eina_Bool
 _ecore_file_monitor_inotify_handler(void *data __UNUSED__, Ecore_Fd_Handler *fdh)
 {
    Ecore_File_Monitor *em;
@@ -170,7 +170,7 @@ _ecore_file_monitor_inotify_handler(void *data __UNUSED__, Ecore_Fd_Handler *fdh
 	_ecore_file_monitor_inotify_events(em, (event->len ? event->name : NULL), event->mask);
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static Ecore_File_Monitor *
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c
index 07b0a88d9a..c293e75b49 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_poll.c
@@ -41,7 +41,7 @@ static Ecore_Timer   *_timer = NULL;
 static Ecore_File_Monitor *_monitors = NULL;
 static int          _lock = 0;
 
-static int         _ecore_file_monitor_poll_handler(void *data);
+static Eina_Bool   _ecore_file_monitor_poll_handler(void *data);
 static void        _ecore_file_monitor_poll_check(Ecore_File_Monitor *em);
 static int         _ecore_file_monitor_poll_checking(Ecore_File_Monitor *em, char *name);
 
@@ -178,7 +178,7 @@ ecore_file_monitor_poll_del(Ecore_File_Monitor *em)
      }
 }
 
-static int
+static Eina_Bool
 _ecore_file_monitor_poll_handler(void *data __UNUSED__)
 {
    Ecore_File_Monitor *l;
@@ -202,7 +202,7 @@ _ecore_file_monitor_poll_handler(void *data __UNUSED__)
 	if (ECORE_FILE_MONITOR_POLL(em)->deleted)
 	  ecore_file_monitor_del(em);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h b/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h
index 265d611690..2593da340f 100644
--- a/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h
+++ b/legacy/ecore/src/lib/ecore_input_evas/Ecore_Input_Evas.h
@@ -42,14 +42,14 @@ typedef void (*Ecore_Event_Mouse_Move_Cb)(void *window, int x, int y, unsigned i
 EAPI int	 ecore_event_evas_init(void);
 EAPI int	 ecore_event_evas_shutdown(void);
 
-EAPI int	 ecore_event_evas_key_down(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_key_up(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_button_up(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_button_down(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_wheel(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_move(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_in(void *data, int type, void *event);
-EAPI int	 ecore_event_evas_mouse_out(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_key_down(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_key_up(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_button_up(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_button_down(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_wheel(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_move(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_in(void *data, int type, void *event);
+EAPI Eina_Bool	 ecore_event_evas_mouse_out(void *data, int type, void *event);
 
 EAPI void        ecore_event_window_register(Ecore_Window id, void *window, Evas *evas, Ecore_Event_Mouse_Move_Cb move_mouse);
 EAPI void        ecore_event_window_unregister(Ecore_Window id);
diff --git a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c b/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c
index 15664dafe6..73fca49054 100644
--- a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c
+++ b/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c
@@ -131,29 +131,29 @@ _ecore_event_window_match(Ecore_Window id)
    return lookup;
 }
 
-static int
+static Eina_Bool
 _ecore_event_evas_key(Ecore_Event_Key *e, Ecore_Event_Press press)
 {
    Ecore_Input_Window *lookup;
 
    lookup = _ecore_event_window_match(e->window);
-   if (!lookup) return 1;
+   if (!lookup) return ECORE_CALLBACK_RENEW;
    ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
    if (press == ECORE_DOWN)
      evas_event_feed_key_down(lookup->evas, e->keyname, e->key, e->string, e->compose, e->timestamp, NULL);
    else
      evas_event_feed_key_up(lookup->evas, e->keyname, e->key, e->string, e->compose, e->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press press)
 {
    Ecore_Input_Window *lookup;
    Evas_Button_Flags flags = EVAS_BUTTON_NONE;
 
    lookup = _ecore_event_window_match(e->window);
-   if (!lookup) return 1;
+   if (!lookup) return ECORE_CALLBACK_RENEW;
    if (e->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
    if (e->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
    if (e->multi.device == 0)
@@ -171,10 +171,10 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press pr
         else
           evas_event_feed_multi_up(lookup->evas, e->multi.device, e->x, e->y, e->multi.radius, e->multi.radius_x, e->multi.radius_y, e->multi.pressure, e->multi.angle, e->multi.x, e->multi.y, flags, e->timestamp, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Move *e;
@@ -182,7 +182,7 @@ ecore_event_evas_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *ev
 
    e = event;
    lookup = _ecore_event_window_match(e->window);
-   if (!lookup) return 1;
+   if (!lookup) return ECORE_CALLBACK_RENEW;
    if (e->multi.device == 0)
      {
         ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
@@ -192,28 +192,28 @@ ecore_event_evas_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *ev
      {
         evas_event_feed_multi_move(lookup->evas, e->multi.device, e->x, e->y, e->multi.radius, e->multi.radius_x, e->multi.radius_y, e->multi.pressure, e->multi.angle, e->multi.x, e->multi.y, e->timestamp, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_button_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_mouse_button((Ecore_Event_Mouse_Button *)event, ECORE_DOWN);
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_button_up(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_mouse_button((Ecore_Event_Mouse_Button *)event, ECORE_UP);
 }
 
-static int
+static Eina_Bool
 _ecore_event_evas_mouse_io(Ecore_Event_Mouse_IO *e, Ecore_Event_IO io)
 {
    Ecore_Input_Window *lookup;
 
    lookup = _ecore_event_window_match(e->window);
-   if (!lookup) return 1;
+   if (!lookup) return ECORE_CALLBACK_RENEW;
    ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
    switch (io)
      {
@@ -228,22 +228,22 @@ _ecore_event_evas_mouse_io(Ecore_Event_Mouse_IO *e, Ecore_Event_IO io)
      }
 
    lookup->move_mouse(lookup->window, e->x, e->y, e->timestamp);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_key((Ecore_Event_Key *)event, ECORE_DOWN);
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_key_up(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_key((Ecore_Event_Key *)event, ECORE_UP);
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Wheel *e;
@@ -251,19 +251,19 @@ ecore_event_evas_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *e
 
    e = event;
    lookup = _ecore_event_window_match(e->window);
-   if (!lookup) return 1;
+   if (!lookup) return ECORE_CALLBACK_RENEW;
    ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers);
    evas_event_feed_mouse_wheel(lookup->evas, e->direction, e->z, e->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_in(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_mouse_io((Ecore_Event_Mouse_IO *)event, ECORE_IN);
 }
 
-EAPI int
+EAPI Eina_Bool
 ecore_event_evas_mouse_out(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    return _ecore_event_evas_mouse_io((Ecore_Event_Mouse_IO *)event, ECORE_OUT);
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index 575378987b..ac700e5e54 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -225,12 +225,12 @@ _ecore_ipc_ddlt_int(int in, int prev, int mode)
    return 0;
 }
 
-static int _ecore_ipc_event_client_add(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_client_del(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_add(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_del(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_client_data(void *data, int ev_type, void *ev);
-static int _ecore_ipc_event_server_data(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_add(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_del(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_add(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_del(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_client_data(void *data, int ev_type, void *ev);
+static Eina_Bool _ecore_ipc_event_server_data(void *data, int ev_type, void *ev);
 static void _ecore_ipc_event_client_add_free(void *data, void *ev);
 static void _ecore_ipc_event_client_del_free(void *data, void *ev);
 static void _ecore_ipc_event_client_data_free(void *data, void *ev);
@@ -1010,20 +1010,20 @@ ecore_ipc_ssl_available_get(void)
 }
 
 
-static int
+static Eina_Bool
 _ecore_ipc_event_client_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Client_Add *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Client *cl;
 	Ecore_Ipc_Server *svr;
 
 	cl = calloc(1, sizeof(Ecore_Ipc_Client));
-	if (!cl) return 0;
+	if (!cl) return ECORE_CALLBACK_CANCEL;
 	svr = ecore_con_server_data_get(ecore_con_client_server_get(e->client));
 	ECORE_MAGIC_SET(cl, ECORE_MAGIC_IPC_CLIENT);
 	cl->client = e->client;
@@ -1045,16 +1045,16 @@ _ecore_ipc_event_client_add(void *data __UNUSED__, int ev_type __UNUSED__, void
 	       }
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_ipc_event_client_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Client_Del *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Client *cl;
@@ -1079,16 +1079,16 @@ _ecore_ipc_event_client_del(void *data __UNUSED__, int ev_type __UNUSED__, void
 	       }
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_ipc_event_server_add(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Server_Add *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Server *svr;
@@ -1108,16 +1108,16 @@ _ecore_ipc_event_server_add(void *data __UNUSED__, int ev_type __UNUSED__, void
 	       }
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _ecore_ipc_event_server_del(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Server_Del *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Server *svr;
@@ -1137,7 +1137,7 @@ _ecore_ipc_event_server_del(void *data __UNUSED__, int ev_type __UNUSED__, void
 	       }
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 #define CLSZ(_n) \
@@ -1181,13 +1181,13 @@ _ecore_ipc_event_server_del(void *data __UNUSED__, int ev_type __UNUSED__, void
      } \
    msg._member = _ecore_ipc_ddlt_int(d, cl->prev.i._member, md);
 
-static int
+static Eina_Bool
 _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Client_Data *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(ecore_con_client_server_get(e->client)))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Client *cl;
@@ -1211,7 +1211,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		  free(cl->buf);
 		  cl->buf = 0;
 		  cl->buf_size  = 0;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 	     cl->buf = buf;
 	     memcpy(cl->buf + cl->buf_size, e->data, e->size);
@@ -1241,7 +1241,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 	     if ((cl->buf_size - offset) < s)
 	       {
 		  if (offset > 0) goto scroll;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 
 	     s = 4;
@@ -1276,7 +1276,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		       if (msg.size > 0)
 			 {
 			    buf = malloc(msg.size);
-			    if (!buf) return 0;
+			    if (!buf) return ECORE_CALLBACK_CANCEL;
 			    memcpy(buf, cl->buf + offset + s, msg.size);
 			 }
 		       if (!cl->delete_me)
@@ -1306,7 +1306,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		       free(cl->buf);
 		       cl->buf = NULL;
 		       cl->buf_size = 0;
-		       return 0;
+		       return ECORE_CALLBACK_CANCEL;
 		    }
 		  goto redo;
 	       }
@@ -1321,7 +1321,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		  free(cl->buf);
 		  cl->buf = NULL;
 		  cl->buf_size = 0;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 	     memcpy(buf, cl->buf + offset, cl->buf_size - offset);
 	     free(cl->buf);
@@ -1329,7 +1329,7 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 	     cl->buf_size -= offset;
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 #define SVSZ(_n) \
@@ -1373,13 +1373,13 @@ _ecore_ipc_event_client_data(void *data __UNUSED__, int ev_type __UNUSED__, void
      } \
    msg._member = _ecore_ipc_ddlt_int(d, svr->prev.i._member, md);
 
-static int
+static Eina_Bool
 _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Con_Event_Server_Data *e;
 
    e = ev;
-   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return 1;
+   if (!eina_list_data_find(servers, ecore_con_server_data_get(e->server))) return ECORE_CALLBACK_RENEW;
    /* handling code here */
      {
 	Ecore_Ipc_Server *svr;
@@ -1403,7 +1403,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		  free(svr->buf);
 		  svr->buf = 0;
 		  svr->buf_size  = 0;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 	     svr->buf = buf;
 	     memcpy(svr->buf + svr->buf_size, e->data, e->size);
@@ -1433,7 +1433,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 	     if ((svr->buf_size - offset) < s)
 	       {
 		  if (offset > 0) goto scroll;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 
 	     s = 4;
@@ -1457,7 +1457,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		       if (msg.size > 0)
 			 {
 			    buf = malloc(msg.size);
-			    if (!buf) return 0;
+			    if (!buf) return ECORE_CALLBACK_CANCEL;
 			    memcpy(buf, svr->buf + offset + s, msg.size);
 			 }
 		       if (!svr->delete_me)
@@ -1487,7 +1487,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		       free(svr->buf);
 		       svr->buf = NULL;
 		       svr->buf_size = 0;
-		       return 0;
+		       return ECORE_CALLBACK_CANCEL;
 		    }
 		  goto redo;
 	       }
@@ -1502,7 +1502,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 		  free(svr->buf);
 		  svr->buf = NULL;
 		  svr->buf_size = 0;
-		  return 0;
+		  return ECORE_CALLBACK_CANCEL;
 	       }
 	     memcpy(buf, svr->buf + offset, svr->buf_size - offset);
 	     free(svr->buf);
@@ -1510,7 +1510,7 @@ _ecore_ipc_event_server_data(void *data __UNUSED__, int ev_type __UNUSED__, void
 	     svr->buf_size -= offset;
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
index 19b458c9a6..af67e5691c 100644
--- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h
+++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h
@@ -1706,7 +1706,7 @@ EAPI int  ecore_x_keyboard_grab(Ecore_X_Window win);
 EAPI void ecore_x_keyboard_ungrab(void);
 EAPI void ecore_x_grab(void);
 EAPI void ecore_x_ungrab(void);
-EAPI void ecore_x_passive_grab_replay_func_set(int (*func) (void *data, int event_type, void *event), void *data);
+EAPI void ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data, int event_type, void *event), void *data);
 EAPI void ecore_x_window_button_grab(Ecore_X_Window win, int button,
 				     Ecore_X_Event_Mask event_mask,
 				     int mod, int any_mod);
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
index 07a76ed619..f3fc6c28b0 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c
@@ -12,8 +12,8 @@
 #include "ecore_xcb_private.h"
 #include "Ecore_X_Atoms.h"
 
-static int _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
 static int _ecore_xcb_key_mask_get(xcb_keysym_t sym);
 static int _ecore_xcb_event_modifier(unsigned int state);
 
@@ -912,7 +912,7 @@ handle_event(xcb_generic_event_t *ev)
      }
 }
 
-static int
+static Eina_Bool
 _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    xcb_connection_t    *c;
@@ -932,10 +932,10 @@ _ecore_xcb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
    while ((ev = xcb_poll_for_event(c)))
      handle_event(ev);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    xcb_connection_t *c;
@@ -944,9 +944,9 @@ _ecore_xcb_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 
    _ecore_xcb_event_buffered = xcb_poll_for_event(c);
    if (!_ecore_xcb_event_buffered)
-     return 0;
+     return ECORE_CALLBACK_CANCEL;
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /* FIXME: possible roundtrip */
@@ -1507,13 +1507,13 @@ ecore_x_ungrab(void)
 
 int      _ecore_window_grabs_num = 0;
 Ecore_X_Window  *_ecore_window_grabs = NULL;
-int    (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
 void    *_ecore_window_grab_replay_data;
 
 EAPI void
-ecore_x_passive_grab_replay_func_set(int (*func) (void *data,
-                                                  int   event_type,
-                                                  void *event),
+ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data,
+							int   event_type,
+							void *event),
                                      void *data)
 {
    _ecore_window_grab_replay_func = func;
diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
index 5a78d674c4..c278611fd1 100644
--- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -506,7 +506,7 @@ _ecore_x_event_handle_button_press(xcb_generic_event_t *event)
 	     if ((_ecore_window_grabs[i] == ev->event) ||
 		 (_ecore_window_grabs[i] == ev->child))
 	       {
-		  int replay = 0;
+		  Eina_Bool replay = EINA_FALSE;
 
 		  if (_ecore_window_grab_replay_func)
 		    replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
@@ -568,7 +568,7 @@ _ecore_x_event_handle_button_press(xcb_generic_event_t *event)
                 if ((_ecore_window_grabs[i] == ev->event) ||
                     (_ecore_window_grabs[i] == ev->child))
                   {
-                     int replay = 0;
+                     Eina_Bool replay = EINA_FALSE;
 
                      if (_ecore_window_grab_replay_func)
                        replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
index a3d7d87a3c..edf7a943ff 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c
@@ -23,8 +23,8 @@
 #include "Ecore_X_Atoms.h"
 #include "Ecore_Input.h"
 
-static int _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
-static int _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler);
 static int _ecore_x_key_mask_get(KeySym sym);
 static int _ecore_x_event_modifier(unsigned int state);
 
@@ -823,7 +823,7 @@ ecore_x_dpi_get(void)
    return (((s->width * 254) / s->mwidth) + 5) / 10;
 }
 
-static int
+static Eina_Bool
 _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Display *d;
@@ -849,17 +849,17 @@ _ecore_x_fd_handler(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 	       _ecore_x_event_handlers[ev.type] (&ev);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _ecore_x_fd_handler_buf(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Display *d;
 
    d = data;
-   if (XPending(d)) return 1;
-   return 0;
+   if (XPending(d)) return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int
@@ -1324,11 +1324,11 @@ ecore_x_ungrab(void)
 
 int      _ecore_window_grabs_num = 0;
 Window  *_ecore_window_grabs = NULL;
-int    (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
 void    *_ecore_window_grab_replay_data;
 
 EAPI void
-ecore_x_passive_grab_replay_func_set(int (*func) (void *data, int event_type, void *event), void *data)
+ecore_x_passive_grab_replay_func_set(Eina_Bool (*func) (void *data, int event_type, void *event), void *data)
 {
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
    _ecore_window_grab_replay_func = func;
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
index 679f5ebc70..bf00c4272f 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c
@@ -504,7 +504,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
 	     if ((_ecore_window_grabs[i] == xevent->xbutton.window) ||
 		 (_ecore_window_grabs[i] == xevent->xbutton.subwindow))
 	       {
-		  int replay = 0;
+		  Eina_Bool replay = EINA_FALSE;
 
 		  if (_ecore_window_grab_replay_func)
 		    replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
@@ -572,7 +572,7 @@ _ecore_x_event_handle_button_press(XEvent *xevent)
 		  if ((_ecore_window_grabs[i] == xevent->xbutton.window) ||
 		      (_ecore_window_grabs[i] == xevent->xbutton.subwindow))
 		    {
-		       int replay = 0;
+		       Eina_Bool replay = EINA_FALSE;
 
 		       if (_ecore_window_grab_replay_func)
 			 replay = _ecore_window_grab_replay_func(_ecore_window_grab_replay_data,
diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
index d9aa988545..17b74a0e81 100644
--- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_private.h
@@ -197,7 +197,7 @@ extern Ecore_X_Atom     _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
 
 extern int      _ecore_window_grabs_num;
 extern Window  *_ecore_window_grabs;
-extern int    (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
+extern Eina_Bool (*_ecore_window_grab_replay_func) (void *data, int event_type, void *event);
 extern void    *_ecore_window_grab_replay_data;
 
 extern Ecore_X_Window _ecore_x_private_win;