diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c
index 88a27a12f..d0d80ff82 100644
--- a/src/bin/e_acpi.c
+++ b/src/bin/e_acpi.c
@@ -19,11 +19,11 @@ struct _ACPIDevice
 };
 
 /* local function prototypes */
-static int _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event);
 static void _e_acpi_cb_event_free(void *data __UNUSED__, void *event);
 static int _e_acpi_lid_status_get(const char *device, const char *bus);
-static int _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event);
 
 /* local variables */
 static int _e_acpi_events_frozen = 0;
@@ -153,14 +153,14 @@ e_acpi_events_thaw(void)
 }
 
 /* local functions */
-static int 
-_e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event) 
+static Eina_Bool
+_e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Con_Event_Server_Del *ev;
    Ecore_Event_Handler *hdl;
 
    ev = event;
-   if (ev->server != _e_acpid) return 1;
+   if (ev->server != _e_acpid) return ECORE_CALLBACK_PASS_ON;
 
    /* cleanup event handlers */
    EINA_LIST_FREE(_e_acpid_hdls, hdl)
@@ -169,11 +169,11 @@ _e_acpi_cb_server_del(void *data __UNUSED__, int type __UNUSED__, void *event)
    /* kill the server if existing */
    if (_e_acpid) ecore_con_server_del(_e_acpid);
    _e_acpid = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event) 
+static Eina_Bool
+_e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Con_Event_Server_Data *ev;
    ACPIDevice *dev;
@@ -189,7 +189,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    /* parse out this acpi string into separate pieces */
    if (sscanf(ev->data, "%s %s %d %d", device, bus, &sig, &status) != 4)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    /* create new event structure to raise */
    acpi_event = E_NEW(E_Event_Acpi, 1);
@@ -248,7 +248,7 @@ _e_acpi_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 
    /* actually raise the event */
    ecore_event_add(event_type, acpi_event, _e_acpi_cb_event_free, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
@@ -299,13 +299,13 @@ _e_acpi_lid_status_get(const char *device, const char *bus)
      return E_ACPI_LID_UNKNOWN;
 }
 
-static int 
-_e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event) 
+static Eina_Bool
+_e_acpi_cb_event(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    E_Event_Acpi *ev;
 
    ev = event;
-   if (_e_acpi_events_frozen > 0) return 1;
+   if (_e_acpi_events_frozen > 0) return ECORE_CALLBACK_PASS_ON;
    e_bindings_acpi_event_handle(E_BINDING_CONTEXT_NONE, NULL, ev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index cbb39efe1..c11708115 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -13,71 +13,71 @@
       act = e_action_add(#name); \
       if (act) act->func.go = _e_actions_act_##name##_go; \
    }
-#define ACT_FN_GO(act) \
-   static void _e_actions_act_##act##_go(E_Object *obj, const char *params)
+#define ACT_FN_GO(act, use)							\
+   static void _e_actions_act_##act##_go(E_Object *obj, use const char *params)
 #define ACT_GO_MOUSE(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \
    }
-#define ACT_FN_GO_MOUSE(act) \
-   static void _e_actions_act_##act##_go_mouse(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
+#define ACT_FN_GO_MOUSE(act, use)						\
+   static void _e_actions_act_##act##_go_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev)
 #define ACT_GO_WHEEL(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \
    }
-#define ACT_FN_GO_WHEEL(act) \
-   static void _e_actions_act_##act##_go_wheel(E_Object *obj, const char *params, Ecore_Event_Mouse_Wheel *ev)
+#define ACT_FN_GO_WHEEL(act, use)						\
+   static void _e_actions_act_##act##_go_wheel(E_Object *obj, use const char *params, Ecore_Event_Mouse_Wheel *ev)
 #define ACT_GO_EDGE(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_edge = _e_actions_act_##name##_go_edge; \
    }
-#define ACT_FN_GO_EDGE(act) \
-   static void _e_actions_act_##act##_go_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev)
+#define ACT_FN_GO_EDGE(act, use)						\
+   static void _e_actions_act_##act##_go_edge(E_Object *obj, use const char *params, E_Event_Zone_Edge *ev)
 #define ACT_GO_SIGNAL(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_signal = _e_actions_act_##name##_go_signal; \
    }
-#define ACT_FN_GO_SIGNAL(act) \
-   static void _e_actions_act_##act##_go_signal(E_Object *obj, const char *params, const char *sig, const char *src)
+#define ACT_FN_GO_SIGNAL(act, use)						\
+   static void _e_actions_act_##act##_go_signal(E_Object *obj, use const char *params, const char *sig, const char *src)
 #define ACT_GO_KEY(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_key = _e_actions_act_##name##_go_key; \
    }
-#define ACT_FN_GO_KEY(act) \
-   static void _e_actions_act_##act##_go_key(E_Object *obj, const char *params, Ecore_Event_Key *ev)
+#define ACT_FN_GO_KEY(act, use)						\
+   static void _e_actions_act_##act##_go_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev)
 #define ACT_END(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end = _e_actions_act_##name##_end; \
    }
-#define ACT_FN_END(act) \
-   static void _e_actions_act_##act##_end(E_Object *obj, const char *params)
+#define ACT_FN_END(act, use)						\
+   static void _e_actions_act_##act##_end(E_Object *obj, use const char *params)
 #define ACT_END_MOUSE(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \
    }
-#define ACT_FN_END_MOUSE(act) \
-   static void _e_actions_act_##act##_end_mouse(E_Object *obj, const char *params, Ecore_Event_Mouse_Button *ev)
+#define ACT_FN_END_MOUSE(act, use)						\
+   static void _e_actions_act_##act##_end_mouse(E_Object *obj, use const char *params, Ecore_Event_Mouse_Button *ev)
 #define ACT_END_KEY(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.end_key = _e_actions_act_##name##_end_key; \
    }
-#define ACT_FN_END_KEY(act) \
-   static void _e_actions_act_##act##_end_key(E_Object *obj, const char *params, Ecore_Event_Key *ev)
+#define ACT_FN_END_KEY(act, use)						\
+   static void _e_actions_act_##act##_end_key(E_Object *obj, use const char *params, Ecore_Event_Key *ev)
 #define ACT_GO_ACPI(name) \
    { \
       act = e_action_add(#name); \
       if (act) act->func.go_acpi = _e_actions_act_##name##_go_acpi; \
    }
-#define ACT_FN_GO_ACPI(act) \
-   static void _e_actions_act_##act##_go_acpi(E_Object *obj, const char *params, E_Event_Acpi *ev)
+#define ACT_FN_GO_ACPI(act, use)						\
+   static void _e_actions_act_##act##_go_acpi(E_Object *obj, use const char *params, E_Event_Acpi *ev)
 
 /* local subsystem functions */
 static void _e_action_free(E_Action *act);
@@ -86,7 +86,7 @@ static int _action_groups_sort_cb(const void *d1, const void *d2);
 
 /* to save writing this in N places - the sctions are defined here */
 /***************************************************************************/
-ACT_FN_GO(window_move)
+ACT_FN_GO(window_move, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -95,7 +95,7 @@ ACT_FN_GO(window_move)
      e_border_act_move_begin((E_Border *)obj, NULL);
 }
 
-ACT_FN_GO_MOUSE(window_move)
+ACT_FN_GO_MOUSE(window_move, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -104,7 +104,7 @@ ACT_FN_GO_MOUSE(window_move)
      e_border_act_move_begin((E_Border *)obj, ev);
 }
 
-ACT_FN_GO_SIGNAL(window_move)
+ACT_FN_GO_SIGNAL(window_move, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -123,7 +123,7 @@ ACT_FN_GO_SIGNAL(window_move)
      }
 }
 
-ACT_FN_END(window_move)
+ACT_FN_END(window_move, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -131,7 +131,7 @@ ACT_FN_END(window_move)
    e_border_act_move_end((E_Border *)obj, NULL);
 }
 
-ACT_FN_END_MOUSE(window_move)
+ACT_FN_END_MOUSE(window_move, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -139,7 +139,7 @@ ACT_FN_END_MOUSE(window_move)
    e_border_act_move_end((E_Border *)obj, ev);
 }
 
-ACT_FN_GO_KEY(window_move)
+ACT_FN_GO_KEY(window_move, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -153,7 +153,7 @@ ACT_FN_GO_KEY(window_move)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_resize)
+ACT_FN_GO(window_resize, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -162,7 +162,7 @@ ACT_FN_GO(window_resize)
      e_border_act_resize_begin((E_Border *)obj, NULL);
 }
 
-ACT_FN_GO_MOUSE(window_resize)
+ACT_FN_GO_MOUSE(window_resize, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -171,7 +171,7 @@ ACT_FN_GO_MOUSE(window_resize)
      e_border_act_resize_begin((E_Border *)obj, ev);
 }
 
-ACT_FN_GO_SIGNAL(window_resize)
+ACT_FN_GO_SIGNAL(window_resize, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -191,7 +191,7 @@ ACT_FN_GO_SIGNAL(window_resize)
      }
 }
 
-ACT_FN_END(window_resize)
+ACT_FN_END(window_resize, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -199,7 +199,7 @@ ACT_FN_END(window_resize)
    e_border_act_resize_end((E_Border *)obj, NULL);
 }
 
-ACT_FN_END_MOUSE(window_resize)
+ACT_FN_END_MOUSE(window_resize, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -207,7 +207,7 @@ ACT_FN_END_MOUSE(window_resize)
    e_border_act_resize_end((E_Border *)obj, ev);
 }
 
-ACT_FN_GO_KEY(window_resize)
+ACT_FN_GO_KEY(window_resize, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -221,7 +221,7 @@ ACT_FN_GO_KEY(window_resize)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_menu)
+ACT_FN_GO(window_menu, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -233,7 +233,7 @@ ACT_FN_GO(window_menu)
    e_border_act_menu_begin((E_Border *)obj, NULL, 0);
 }
 
-ACT_FN_GO_MOUSE(window_menu)
+ACT_FN_GO_MOUSE(window_menu, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -245,7 +245,7 @@ ACT_FN_GO_MOUSE(window_menu)
    e_border_act_menu_begin((E_Border *)obj, ev, 0);
 }
 
-ACT_FN_GO_KEY(window_menu)
+ACT_FN_GO_KEY(window_menu, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -258,7 +258,7 @@ ACT_FN_GO_KEY(window_menu)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_raise)
+ACT_FN_GO(window_raise, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -272,7 +272,7 @@ ACT_FN_GO(window_raise)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_lower)
+ACT_FN_GO(window_lower, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -286,7 +286,7 @@ ACT_FN_GO(window_lower)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_close)
+ACT_FN_GO(window_close, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -333,7 +333,7 @@ _e_actions_cb_kill_dialog_delete(E_Win *win)
    _e_actions_cb_kill_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(window_kill)
+ACT_FN_GO(window_kill, __UNUSED__)
 {
    E_Border *bd;
    char dialog_text[1024];
@@ -382,7 +382,7 @@ ACT_FN_GO(window_kill)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_sticky_toggle)
+ACT_FN_GO(window_sticky_toggle, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -402,7 +402,7 @@ ACT_FN_GO(window_sticky_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_sticky)
+ACT_FN_GO(window_sticky, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -427,7 +427,7 @@ ACT_FN_GO(window_sticky)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_iconic_toggle)
+ACT_FN_GO(window_iconic_toggle, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -447,7 +447,7 @@ ACT_FN_GO(window_iconic_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_iconic)
+ACT_FN_GO(window_iconic, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -472,7 +472,7 @@ ACT_FN_GO(window_iconic)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_fullscreen_toggle)
+ACT_FN_GO(window_fullscreen_toggle, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -498,7 +498,7 @@ ACT_FN_GO(window_fullscreen_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_fullscreen)
+ACT_FN_GO(window_fullscreen, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -537,7 +537,7 @@ ACT_FN_GO(window_fullscreen)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_maximized_toggle)
+ACT_FN_GO(window_maximized_toggle, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -587,7 +587,7 @@ maximize:
      }
 }
 /***************************************************************************/
-ACT_FN_GO(window_maximized)
+ACT_FN_GO(window_maximized, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -641,7 +641,7 @@ ACT_FN_GO(window_maximized)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_shaded_toggle)
+ACT_FN_GO(window_shaded_toggle, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -695,7 +695,7 @@ ACT_FN_GO(window_shaded_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_shaded)
+ACT_FN_GO(window_shaded, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -744,7 +744,7 @@ ACT_FN_GO(window_shaded)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_borderless_toggle)
+ACT_FN_GO(window_borderless_toggle, __UNUSED__)
 {
    if ((!obj) || (obj->type != E_BORDER_TYPE)) 
      obj = E_OBJECT(e_border_focused_get());
@@ -765,7 +765,7 @@ ACT_FN_GO(window_borderless_toggle)
 }
 
  /***************************************************************************/
-ACT_FN_GO(window_pinned_toggle) 
+ACT_FN_GO(window_pinned_toggle, __UNUSED__)
 { 
    if ((!obj) || (obj->type != E_BORDER_TYPE)) 
      obj = E_OBJECT(e_border_focused_get()); 
@@ -784,7 +784,7 @@ ACT_FN_GO(window_pinned_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_move_by)
+ACT_FN_GO(window_move_by, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -813,7 +813,7 @@ ACT_FN_GO(window_move_by)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_move_to)
+ACT_FN_GO(window_move_to, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -868,7 +868,7 @@ ACT_FN_GO(window_move_to)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_move_to_center)
+ACT_FN_GO(window_move_to_center, __UNUSED__)
 {
    E_Border *bd;
    int x, y;
@@ -896,7 +896,7 @@ ACT_FN_GO(window_move_to_center)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_resize_by)
+ACT_FN_GO(window_resize_by, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -929,7 +929,7 @@ ACT_FN_GO(window_resize_by)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_push)
+ACT_FN_GO(window_push, )
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -1040,7 +1040,7 @@ ACT_FN_GO(window_push)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_drag_icon)
+ACT_FN_GO(window_drag_icon, __UNUSED__)
 {
    if (!obj) obj = E_OBJECT(e_border_focused_get());
    if (!obj) return;
@@ -1060,7 +1060,7 @@ ACT_FN_GO(window_drag_icon)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_desk_move_by)
+ACT_FN_GO(window_desk_move_by, )
 {
    E_Border *bd;
    int x, y;
@@ -1119,7 +1119,7 @@ ACT_FN_GO(window_desk_move_by)
 }
 
 /***************************************************************************/
-ACT_FN_GO(window_desk_move_to)
+ACT_FN_GO(window_desk_move_to, )
 {
    E_Border *bd;
    int x, y;
@@ -1161,8 +1161,8 @@ _e_actions_zone_get(E_Object *obj)
      }
    return e_util_zone_current_get(e_manager_current_get());
 }
-	  
-ACT_FN_GO(desk_flip_by)
+
+ACT_FN_GO(desk_flip_by, )
 {
    E_Zone *zone;
 
@@ -1180,7 +1180,7 @@ ACT_FN_GO(desk_flip_by)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_flip_to)
+ACT_FN_GO(desk_flip_to, )
 {
    E_Zone *zone;
 
@@ -1207,7 +1207,7 @@ ACT_FN_GO(desk_flip_to)
 #define ACT_FLIP_DOWN_RIGHT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1) && ((zone)->desk_y_count > 1)) || ((((zone)->desk_x_current + 1) < (zone)->desk_x_count) && (((zone)->desk_y_current + 1) < (zone)->desk_y_count)))
 #define ACT_FLIP_DOWN_LEFT(zone) ((e_config->desk_flip_wrap && ((zone)->desk_x_count > 1) && ((zone)->desk_y_count > 1)) || (((zone)->desk_x_current > 0) && (((zone)->desk_y_current + 1) < (zone)->desk_y_count)))
 
-ACT_FN_GO_EDGE(desk_flip_in_direction)
+ACT_FN_GO_EDGE(desk_flip_in_direction, )
 {
    E_Zone *zone;
    E_Desk *current = NULL;
@@ -1311,7 +1311,7 @@ ACT_FN_GO_EDGE(desk_flip_in_direction)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_linear_flip_by)
+ACT_FN_GO(desk_linear_flip_by, )
 {
    E_Zone *zone;
 
@@ -1329,7 +1329,7 @@ ACT_FN_GO(desk_linear_flip_by)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_linear_flip_to)
+ACT_FN_GO(desk_linear_flip_to, )
 {
    E_Zone *zone;
 
@@ -1363,7 +1363,7 @@ ACT_FN_GO(desk_linear_flip_to)
 
 
 /***************************************************************************/
-ACT_FN_GO(desk_flip_by_all)
+ACT_FN_GO(desk_flip_by_all, )
 {
    if (params)
      {
@@ -1377,7 +1377,7 @@ ACT_FN_GO(desk_flip_by_all)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_flip_to_all)
+ACT_FN_GO(desk_flip_to_all, )
 {
    if (params)
      {
@@ -1391,7 +1391,7 @@ ACT_FN_GO(desk_flip_to_all)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_linear_flip_by_all)
+ACT_FN_GO(desk_linear_flip_by_all, )
 {
    if (params)
      {
@@ -1405,7 +1405,7 @@ ACT_FN_GO(desk_linear_flip_by_all)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_linear_flip_to_all)
+ACT_FN_GO(desk_linear_flip_to_all, )
 {
    if (params)
      {
@@ -1419,7 +1419,7 @@ ACT_FN_GO(desk_linear_flip_to_all)
 }
 
 /***************************************************************************/
-ACT_FN_GO(screen_send_to)
+ACT_FN_GO(screen_send_to, )
 {
    E_Zone *zone;
 
@@ -1456,7 +1456,7 @@ ACT_FN_GO(screen_send_to)
      }
 }
 
-ACT_FN_GO(screen_send_by)
+ACT_FN_GO(screen_send_by, )
 {
    E_Zone *zone;
 
@@ -1526,7 +1526,7 @@ ACT_FN_GO(screen_send_by)
 
 /***************************************************************************/
 #if 0
-ACT_FN_GO(zone_desk_flip_by)
+ACT_FN_GO(zone_desk_flip_by, )
 {
    if (params)
      {
@@ -1542,7 +1542,7 @@ ACT_FN_GO(zone_desk_flip_by)
 
 /***************************************************************************/
 #if 0
-ACT_FN_GO(zone_desk_flip_to)
+ACT_FN_GO(zone_desk_flip_to, )
 {
    if (params)
      {
@@ -1558,7 +1558,7 @@ ACT_FN_GO(zone_desk_flip_to)
 
 /***************************************************************************/
 #if 0
-ACT_FN_GO(zone_desk_linear_flip_by)
+ACT_FN_GO(zone_desk_linear_flip_by, )
 {
    if (params)
      {
@@ -1574,7 +1574,7 @@ ACT_FN_GO(zone_desk_linear_flip_by)
 
 /***************************************************************************/
 #if 0
-ACT_FN_GO(zone_desk_linear_flip_to)
+ACT_FN_GO(zone_desk_linear_flip_to, )
 {
    if (params)
      {
@@ -1613,7 +1613,7 @@ _e_actions_menu_find(const char *name)
    return NULL;
 }
 
-ACT_FN_GO(menu_show)
+ACT_FN_GO(menu_show, )
 {
    E_Zone *zone;
 
@@ -1643,7 +1643,7 @@ ACT_FN_GO(menu_show)
      }
 }
 
-ACT_FN_GO_MOUSE(menu_show)
+ACT_FN_GO_MOUSE(menu_show, )
 {
    E_Zone *zone;
 
@@ -1675,7 +1675,7 @@ ACT_FN_GO_MOUSE(menu_show)
      }
 }
 
-ACT_FN_GO_KEY(menu_show)
+ACT_FN_GO_KEY(menu_show, )
 {
    E_Zone *zone;
 
@@ -1705,7 +1705,7 @@ ACT_FN_GO_KEY(menu_show)
 }
 
 /***************************************************************************/
-ACT_FN_GO(exec)
+ACT_FN_GO(exec, )
 {
    E_Zone *zone;
 
@@ -1718,7 +1718,7 @@ ACT_FN_GO(exec)
 }
 
 /***************************************************************************/
-ACT_FN_GO(app)
+ACT_FN_GO(app, )
 {
    E_Zone *zone;
 
@@ -1755,7 +1755,7 @@ ACT_FN_GO(app)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_deskshow_toggle)
+ACT_FN_GO(desk_deskshow_toggle, __UNUSED__)
 {
    E_Zone *zone;
 
@@ -1764,7 +1764,7 @@ ACT_FN_GO(desk_deskshow_toggle)
    if (zone) e_desk_deskshow(zone);
 }
 
-ACT_FN_GO(cleanup_windows)
+ACT_FN_GO(cleanup_windows, __UNUSED__)
 {
    E_Zone *zone;
 
@@ -1803,7 +1803,7 @@ _e_actions_cb_exit_dialog_delete(E_Win *win)
    _e_actions_cb_exit_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(exit)
+ACT_FN_GO(exit, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -1837,25 +1837,25 @@ ACT_FN_GO(exit)
 }
 
 /***************************************************************************/
-ACT_FN_GO(restart)
+ACT_FN_GO(restart, __UNUSED__)
 {
    e_sys_action_do(E_SYS_RESTART, NULL);
 }
 
 /***************************************************************************/
-ACT_FN_GO(exit_now)
+ACT_FN_GO(exit_now, __UNUSED__)
 {
    e_sys_action_do(E_SYS_EXIT_NOW, NULL);
 }
 
 /***************************************************************************/
-ACT_FN_GO(halt_now)
+ACT_FN_GO(halt_now, __UNUSED__)
 {
    e_sys_action_do(E_SYS_HALT_NOW, NULL);
 }
 
 /***************************************************************************/
-ACT_FN_GO(mode_presentation_toggle)
+ACT_FN_GO(mode_presentation_toggle, __UNUSED__)
 {
    e_config->mode.presentation = !e_config->mode.presentation;
    e_config_mode_changed();
@@ -1863,7 +1863,7 @@ ACT_FN_GO(mode_presentation_toggle)
 }
 
 /***************************************************************************/
-ACT_FN_GO(mode_offline_toggle)
+ACT_FN_GO(mode_offline_toggle, __UNUSED__)
 {
    e_config->mode.offline = !e_config->mode.offline;
    e_config_mode_changed();
@@ -1900,7 +1900,7 @@ _e_actions_cb_logout_dialog_delete(E_Win *win)
    _e_actions_cb_logout_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(logout)
+ACT_FN_GO(logout, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -1963,7 +1963,7 @@ _e_actions_cb_halt_dialog_delete(E_Win *win)
    _e_actions_cb_halt_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(halt)
+ACT_FN_GO(halt, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -2026,7 +2026,7 @@ _e_actions_cb_reboot_dialog_delete(E_Win *win)
    _e_actions_cb_reboot_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(reboot)
+ACT_FN_GO(reboot, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -2089,7 +2089,7 @@ _e_actions_cb_suspend_dialog_delete(E_Win *win)
    _e_actions_cb_suspend_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(suspend)
+ACT_FN_GO(suspend, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -2152,7 +2152,7 @@ _e_actions_cb_hibernate_dialog_delete(E_Win *win)
    _e_actions_cb_hibernate_dialog_cancel(NULL, dia);
 }
 
-ACT_FN_GO(hibernate)
+ACT_FN_GO(hibernate, )
 {
    if ((params) && (!strcmp(params, "now")))
      {
@@ -2186,7 +2186,7 @@ ACT_FN_GO(hibernate)
 }
 
 /***************************************************************************/
-ACT_FN_GO(pointer_resize_push)
+ACT_FN_GO(pointer_resize_push, )
 {
    if (!obj) return;
    if (obj->type == E_BORDER_TYPE)
@@ -2204,7 +2204,7 @@ ACT_FN_GO(pointer_resize_push)
 }
 
 /***************************************************************************/
-ACT_FN_GO(pointer_resize_pop)
+ACT_FN_GO(pointer_resize_pop, )
 {
    if (!obj) return;
    if (obj->type == E_BORDER_TYPE)
@@ -2221,7 +2221,7 @@ ACT_FN_GO(pointer_resize_pop)
 }
 
 /***************************************************************************/
-ACT_FN_GO(desk_lock)
+ACT_FN_GO(desk_lock, __UNUSED__)
 {
 /*  E_Zone *zone;
 
@@ -2231,7 +2231,7 @@ ACT_FN_GO(desk_lock)
 }
 
 /***************************************************************************/
-ACT_FN_GO(shelf_show)
+ACT_FN_GO(shelf_show, )
 {
    Eina_List *l;
    E_Shelf *es;
@@ -2262,7 +2262,7 @@ if ((!params) || (params && (fnmatch(params, es->name, 0) == 0))) \
      e_shelf_toggle(es, 0); \
   }
 
-ACT_FN_GO_EDGE(shelf_show)
+ACT_FN_GO_EDGE(shelf_show, )
 {
    Eina_List *l;
    E_Shelf *es;
@@ -2345,7 +2345,7 @@ _delayed_action_free(Delayed_Action *da)
    free(da);
 }
 
-static int
+static Eina_Bool
 _delayed_action_cb_timer(void *data)
 {
    Delayed_Action *da;
@@ -2360,7 +2360,7 @@ _delayed_action_cb_timer(void *data)
      }
    _delayed_actions = eina_list_remove(_delayed_actions, da);
    _delayed_action_free(da);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -2509,8 +2509,8 @@ _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_B
 
    EINA_LIST_FOREACH(_delayed_actions, l, da)
      {
-	if ((da->obj == obj) && (da->mouse) && 
-	    (ev->buttons == da->button))
+	if ((da->obj == obj) && (da->mouse) &&
+	    ((int) ev->buttons == da->button))
 	  {
 	     _delayed_action_do(da);
 	     _delayed_action_free(da);
@@ -2521,32 +2521,32 @@ _delayed_action_mouse_del(E_Object *obj, const char *params, Ecore_Event_Mouse_B
 }
 
 // obj , params  , ev
-ACT_FN_GO_KEY(delayed_action)
+ACT_FN_GO_KEY(delayed_action, )
 {
    _delayed_action_key_add(obj, params, ev);
 }
 
-ACT_FN_GO_MOUSE(delayed_action)
+ACT_FN_GO_MOUSE(delayed_action, )
 {
    _delayed_action_mouse_add(obj, params, ev);
 }
 
-ACT_FN_END_KEY(delayed_action)
+ACT_FN_END_KEY(delayed_action, )
 {
    _delayed_action_key_del(obj, params, ev);
 }
 
-ACT_FN_END_MOUSE(delayed_action)
+ACT_FN_END_MOUSE(delayed_action, )
 {
    _delayed_action_mouse_del(obj, params, ev);
 }
 
-ACT_FN_GO_ACPI(dim_screen) 
+ACT_FN_GO_ACPI(dim_screen, __UNUSED__)
 {
    printf("Dim Screen\n");
 }
 
-ACT_FN_GO_ACPI(undim_screen) 
+ACT_FN_GO_ACPI(undim_screen, __UNUSED__)
 {
    printf("Undim Screen\n");
 }
diff --git a/src/bin/e_bg.c b/src/bin/e_bg.c
index 772f08880..5098ccd16 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -6,7 +6,7 @@
 /* local subsystem functions */
 static void _e_bg_signal(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_bg_event_bg_update_free(void *data, void *event);
-static int  _e_bg_slide_animator(void *data);
+static Eina_Bool  _e_bg_slide_animator(void *data);
 
 static void _e_bg_image_import_dialog_done(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode);
 static void _e_bg_image_import_done(void *data, Eina_Bool ok, const char *image_path, const char *edje_path);
@@ -710,7 +710,7 @@ _e_bg_event_bg_update_free(void *data __UNUSED__, void *event)
    free(event);
 }
 
-static int
+static Eina_Bool
 _e_bg_slide_animator(void *data)
 {
    E_Bg_Anim_Params *params;
@@ -773,9 +773,9 @@ _e_bg_slide_animator(void *data)
 	evas_object_data_del(zone->bg_object, "switch_animator");
 	evas_object_data_del(zone->bg_object, "switch_animator_params");
 	E_FREE(params);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index b02120b12..8da2491cb 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -14,7 +14,7 @@ static void _e_bindings_acpi_free(E_Binding_Acpi *bind);
 static int _e_bindings_context_match(E_Binding_Context bctxt, E_Binding_Context ctxt);
 static E_Binding_Modifier _e_bindings_modifiers(unsigned int modifiers);
 static int _e_ecore_modifiers(E_Binding_Modifier modifiers);
-static int _e_bindings_edge_cb_timer(void *data);
+static Eina_Bool _e_bindings_edge_cb_timer(void *data);
 
 /* local subsystem globals */
 
@@ -190,7 +190,7 @@ e_bindings_mouse_down_find(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mo
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-	if ((bind->button == ev->buttons) &&
+	if ((bind->button == (int) ev->buttons) &&
 	    ((bind->any_mod) || (bind->mod == mod)))
 	  {
 	     if (_e_bindings_context_match(bind->ctxt, ctxt))
@@ -234,7 +234,7 @@ e_bindings_mouse_up_find(E_Binding_Context ctxt, E_Object *obj, Ecore_Event_Mous
    mod = _e_bindings_modifiers(ev->modifiers);
    EINA_LIST_FOREACH(mouse_bindings, l, bind)
      {
-	if ((bind->button == ev->buttons) &&
+	if ((bind->button == (int) ev->buttons) &&
 	    ((bind->any_mod) || (bind->mod == mod)))
 	  {
 	     if (_e_bindings_context_match(bind->ctxt, ctxt))
@@ -1078,7 +1078,7 @@ _e_ecore_modifiers(E_Binding_Modifier modifiers)
    return mod;
 }
 
-static int
+static Eina_Bool
 _e_bindings_edge_cb_timer(void *data)
 {
    E_Binding_Edge_Data *ed;
@@ -1105,6 +1105,6 @@ _e_bindings_edge_cb_timer(void *data)
    /* Duplicate event */
    E_FREE(ev);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 6b927dd58..6aeafcb8d 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -25,37 +25,37 @@ static void _e_border_del(E_Border *bd);
 /* FIXME: these likely belong in a separate icccm/client handler */
 /* and the border needs to become a dumb object that just does what its */
 /* told to do */
-static int _e_border_cb_window_show_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_destroy(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_hide(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_reparent(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_configure_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_resize_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_gravity(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_stack_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_property(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_colormap(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_shape(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_focus_in(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_focus_out(void *data, int ev_type, void *ev);
-static int _e_border_cb_client_message(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_show_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_destroy(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_hide(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_reparent(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_configure_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_resize_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_gravity(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_stack_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_property(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_colormap(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_shape(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_focus_in(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_focus_out(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_client_message(void *data, int ev_type, void *ev);
 
-static int _e_border_cb_window_state_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev);
-static int _e_border_cb_desktop_change(void *data, int ev_type, void *ev);
-static int _e_border_cb_sync_alarm(void *data, int ev_type, void *ev);
-static int _e_border_cb_efreet_cache_update(void *data, int ev_type, void *ev);
-static int _e_border_cb_config_icon_theme(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_state_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_desktop_change(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_sync_alarm(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_efreet_cache_update(void *data, int ev_type, void *ev);
+static Eina_Bool _e_border_cb_config_icon_theme(void *data, int ev_type, void *ev);
 
-static int  _e_border_cb_pointer_warp(void *data, int ev_type, void *ev);
+static Eina_Bool  _e_border_cb_pointer_warp(void *data, int ev_type, void *ev);
 static void _e_border_cb_signal_bind(void *data, Evas_Object *obj, const char *emission, const char *source);
-static int  _e_border_cb_mouse_in(void *data, int type, void *event);
-static int  _e_border_cb_mouse_out(void *data, int type, void *event);
-static int  _e_border_cb_mouse_wheel(void *data, int type, void *event);
-static int  _e_border_cb_mouse_down(void *data, int type, void *event);
-static int  _e_border_cb_mouse_up(void *data, int type, void *event);
-static int  _e_border_cb_mouse_move(void *data, int type, void *event);
-static int  _e_border_cb_grab_replay(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_in(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_out(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool  _e_border_cb_grab_replay(void *data, int type, void *event);
 static void _e_border_cb_drag_finished(E_Drag *drag, int dropped);
 
 static void _e_border_eval(E_Border *bd);
@@ -65,7 +65,7 @@ static void _e_border_container_layout_hook(E_Container *con);
 static void _e_border_moveinfo_gather(E_Border *bd, const char *source);
 static void _e_border_resize_handle(E_Border *bd);
 
-static int  _e_border_shade_animator(void *data);
+static Eina_Bool  _e_border_shade_animator(void *data);
 
 static void _e_border_event_border_add_free(void *data, void *ev);
 static void _e_border_event_border_remove_free(void *data, void *ev);
@@ -98,8 +98,8 @@ static int  _e_border_move_begin(E_Border *bd);
 static int  _e_border_move_end(E_Border *bd);
 static void _e_border_move_update(E_Border *bd);
 
-static int  _e_border_cb_ping_poller(void *data);
-static int  _e_border_cb_kill_timer(void *data);
+static Eina_Bool  _e_border_cb_ping_poller(void *data);
+static Eina_Bool  _e_border_cb_kill_timer(void *data);
 
 static void _e_border_pointer_resize_begin(E_Border *bd);
 static void _e_border_pointer_resize_end(E_Border *bd);
@@ -2877,12 +2877,12 @@ _e_border_key_down_modifier_apply(int modifier, int value)
    return value;
 }
 
-static int
-_e_border_action_move_timeout(void *data)
+static Eina_Bool
+_e_border_action_move_timeout(__UNUSED__ void *data)
 {
    _e_border_move_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -2893,14 +2893,14 @@ _e_border_action_move_timeout_add(void)
    action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL);
 }
 
-static int
-_e_border_move_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_border_move_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev = event;
    int x, y;
 
    if (ev->event_window != action_input_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    if (!action_border)
      {
 	fputs("ERROR: no action_border!\n", stderr);
@@ -2932,28 +2932,28 @@ _e_border_move_key_down(void *data, int type, void *event)
    e_border_move(action_border, x, y);
    _e_border_action_move_timeout_add();
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 
  stop:
    _e_border_move_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_border_move_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_border_move_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
 
    if (ev->event_window != action_input_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (!action_border)
      fputs("ERROR: no action_border!\n", stderr);
 
    _e_border_move_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 EAPI void
@@ -2984,12 +2984,12 @@ e_border_act_move_keyboard(E_Border *bd)
    action_handler_mouse = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, _e_border_move_mouse_down, NULL);
 }
 
-static int
-_e_border_action_resize_timeout(void *data)
+static Eina_Bool
+_e_border_action_resize_timeout(__UNUSED__ void *data)
 {
    _e_border_resize_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -3000,14 +3000,14 @@ _e_border_action_resize_timeout_add(void)
    action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL);
 }
 
-static int
-_e_border_resize_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_border_resize_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev = event;
    int w, h, dx, dy;
 
    if (ev->event_window != action_input_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    if (!action_border)
      {
 	fputs("ERROR: no action_border!\n", stderr);
@@ -3054,28 +3054,28 @@ _e_border_resize_key_down(void *data, int type, void *event)
    e_border_resize(action_border, w, h);
    _e_border_action_resize_timeout_add();
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 
  stop:
    _e_border_resize_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_border_resize_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_border_resize_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
 
    if (ev->event_window != action_input_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (!action_border)
      fputs("ERROR: no action_border!\n", stderr);
 
    _e_border_resize_end(action_border);
    _e_border_action_finish();
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 EAPI void
@@ -3430,7 +3430,7 @@ e_border_lost_windows_get(E_Zone *zone)
 						  bd->zone->w - (2 * loss_overlap),
 						  bd->zone->h - (2 * loss_overlap),
 						  rect[i].x, rect[i].y,
-						  rect[i].width, rect[i].height))
+						  (int) rect[i].width, (int) rect[i].height))
 				   {
 				      ok = 1;
 				      break;
@@ -4006,15 +4006,15 @@ _e_border_del(E_Border *bd)
      }
 }
 
-static int
-_e_border_cb_window_show_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_show_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Show_Request *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
    if (bd->iconic)
      {
 	if (!bd->lock_client_iconify)
@@ -4027,25 +4027,25 @@ _e_border_cb_window_show_request(void *data, int ev_type, void *ev)
 	if (!bd->lock_client_stacking)
 	  e_border_raise(bd);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_destroy(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_destroy(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Destroy *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
    e_border_hide(bd, 0);
    e_object_del(E_OBJECT(bd));
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_hide(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_hide(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Hide *e;
@@ -4053,15 +4053,15 @@ _e_border_cb_window_hide(void *data, int ev_type, void *ev)
    e = ev;
 //   printf("HIDE: %x, event %x\n", e->win, e->event_win);
 // not interested in hide events from windows other than the window in question
-   if (e->win != e->event_win) return 1;
+   if (e->win != e->event_win) return ECORE_CALLBACK_PASS_ON;
    bd = e_border_find_by_client_window(e->win);
 //   printf("  bd = %p\n", bd);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 //   printf("  bd->ignore_first_unmap = %i\n", bd->ignore_first_unmap);
    if (bd->ignore_first_unmap > 0)
      {
 	bd->ignore_first_unmap--;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    /* Don't delete hidden or iconified windows */
    if ((bd->iconic) || ((!bd->visible) && (!bd->new_client)) || 
@@ -4111,11 +4111,11 @@ _e_border_cb_window_hide(void *data, int ev_type, void *ev)
 	  }
 	e_object_del(E_OBJECT(bd));
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_reparent(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_reparent(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
 #if 0
    E_Border *bd;
@@ -4132,11 +4132,11 @@ _e_border_cb_window_reparent(void *data, int ev_type, void *ev)
    e_border_hide(bd, 0);
    e_object_del(E_OBJECT(bd));
 #endif
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_configure_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Configure_Request *e;
@@ -4145,12 +4145,12 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
    bd = e_border_find_by_client_window(e->win);
    if (!bd)
      {
-	if (e_stolen_win_get(e->win)) return 1;
+	if (e_stolen_win_get(e->win)) return ECORE_CALLBACK_PASS_ON;
 	if (!e_util_container_window_find(e->win))
 	  ecore_x_window_configure(e->win, e->value_mask,
 				   e->x, e->y, e->w, e->h, e->border,
 				   e->abovewin, e->detail);
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 
    if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X) ||
@@ -4339,11 +4339,11 @@ _e_border_cb_window_configure_request(void *data, int ev_type, void *ev)
      }
 
    _e_border_client_move_resize_send(bd);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_resize_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Resize_Request *e;
@@ -4352,9 +4352,9 @@ _e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
    bd = e_border_find_by_client_window(e->win);
    if (!bd)
      {
-	if (e_stolen_win_get(e->win)) return 1;
+	if (e_stolen_win_get(e->win)) return ECORE_CALLBACK_PASS_ON;
 	ecore_x_window_resize(e->win, e->w, e->h);
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
      {
 	int w, h;
@@ -4384,11 +4384,11 @@ _e_border_cb_window_resize_request(void *data, int ev_type, void *ev)
      }
 
      _e_border_client_move_resize_send(bd);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_gravity(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_gravity(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
 //   E_Border *bd;
 //   Ecore_X_Event_Window_Gravity *e;
@@ -4399,8 +4399,8 @@ _e_border_cb_window_gravity(void *data, int ev_type, void *ev)
    return 1;
 }
 
-static int
-_e_border_cb_window_stack_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_stack_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Stack_Request *e;
@@ -4409,7 +4409,7 @@ _e_border_cb_window_stack_request(void *data, int ev_type, void *ev)
    bd = e_border_find_by_client_window(e->win);
    if (!bd)
      {
-	if (e_stolen_win_get(e->win)) return 1;
+	if (e_stolen_win_get(e->win)) return ECORE_CALLBACK_PASS_ON;
 	if (!e_util_container_window_find(e->win))
 	  {
 	     if (e->detail == ECORE_X_WINDOW_STACK_ABOVE)
@@ -4417,24 +4417,24 @@ _e_border_cb_window_stack_request(void *data, int ev_type, void *ev)
 	     else if (e->detail == ECORE_X_WINDOW_STACK_BELOW)
 	       ecore_x_window_lower(e->win);
 	  }
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    if (e->detail == ECORE_X_WINDOW_STACK_ABOVE)
      e_border_raise(bd);
    else if (e->detail == ECORE_X_WINDOW_STACK_BELOW)
      e_border_lower(bd);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_property(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_property(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Property *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
    if (e->atom == ECORE_X_ATOM_WM_NAME)
      {
 	if ((!bd->client.netwm.name) &&
@@ -4603,23 +4603,23 @@ _e_border_cb_window_property(void *data, int ev_type, void *ev)
 	printf("ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER\n");
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_colormap(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_colormap(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Colormap *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
-   return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_shape(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Shape *e;
@@ -4630,34 +4630,34 @@ _e_border_cb_window_shape(void *data, int ev_type, void *ev)
      {
 	bd->changes.shape = 1;
 	bd->changed = 1;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    bd = e_border_find_by_window(e->win);
    if (bd)
      {
 	bd->need_shape_export = 1;
 	bd->changed = 1;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    bd = e_border_find_by_frame_window(e->win);
    if (bd)
      {
 	bd->need_shape_merge = 1;
 	bd->changed = 1;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_focus_in(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_focus_in(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Focus_In *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 #ifdef INOUTDEBUG_FOCUS
      {
 	time_t t;
@@ -4692,25 +4692,25 @@ _e_border_cb_window_focus_in(void *data, int ev_type, void *ev)
 #endif
    if (e->mode == ECORE_X_EVENT_MODE_GRAB)
      {
-	if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_UNGRAB)
      {
-	if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
      }
    e_border_focus_set(bd, 1, 0);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_focus_out(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_focus_out(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Focus_Out *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 #ifdef INOUTDEBUG_FOCUS
      {
 	time_t t;
@@ -4745,36 +4745,36 @@ _e_border_cb_window_focus_out(void *data, int ev_type, void *ev)
 #endif   
    if (e->mode == ECORE_X_EVENT_MODE_NORMAL)
      {
-	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_GRAB)
      {
-	if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_VIRTUAL) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_NON_LINEAR_VIRTUAL) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_VIRTUAL) return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_UNGRAB)
      {
 	/* for firefox/thunderbird (xul) menu walking */
 	/* NB: why did i disable this before? */
-	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_POINTER) return ECORE_CALLBACK_PASS_ON;
      }
    else if (e->mode == ECORE_X_EVENT_MODE_WHILE_GRABBED)
      {
-	if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return 1;
-	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
+	if (e->detail == ECORE_X_EVENT_DETAIL_ANCESTOR) return ECORE_CALLBACK_PASS_ON;
+	else if (e->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
      }
    e_border_focus_set(bd, 0, 0);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_client_message(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_client_message(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    /*
    E_Border *bd;
@@ -4787,8 +4787,8 @@ _e_border_cb_client_message(void *data, int ev_type, void *ev)
    return 1;
 }
 
-static int
-_e_border_cb_window_state_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_state_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_State_Request *e;
@@ -4796,29 +4796,29 @@ _e_border_cb_window_state_request(void *data, int ev_type, void *ev)
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 
    for (i = 0; i < 2; i++)
      e_hints_window_state_update(bd, e->state[i], e->action);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_window_move_resize_request(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Window_Move_Resize_Request *e;
 
    e = ev;
    bd = e_border_find_by_client_window(e->win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 
    if ((bd->shaded) || (bd->shading) ||
        ((bd->maximized) && (!e_config->allow_manip)) ||
        (bd->fullscreen) || (bd->moving) ||
        (bd->resize_mode != RESIZE_NONE))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if ((e->button >= 1) && (e->button <= 3))
      {
@@ -4860,11 +4860,11 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
 		  bd->cur_mouse_action->func.go(E_OBJECT(bd), NULL); 
 	       }
 	  }
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 
    if (!_e_border_resize_begin(bd))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    switch(e->direction)
      {
@@ -4901,7 +4901,7 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
 	 GRAV_SET(bd, ECORE_X_GRAVITY_E);
 	 break;
       default:
-	 return 1;
+	 return ECORE_CALLBACK_PASS_ON;
      }
    
    bd->cur_mouse_action = e_action_find("window_resize");
@@ -4914,11 +4914,11 @@ _e_border_cb_window_move_resize_request(void *data, int ev_type, void *ev)
    if (bd->cur_mouse_action)
      e_object_ref(E_OBJECT(bd->cur_mouse_action));
    
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_desktop_change(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_desktop_change(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Desktop_Change *e;
@@ -4929,7 +4929,7 @@ _e_border_cb_desktop_change(void *data, int ev_type, void *ev)
      {
 	if (e->desk == 0xffffffff)
 	  e_border_stick(bd);
-	else if (e->desk < (bd->zone->desk_x_count * bd->zone->desk_y_count))
+	else if ((int) e->desk < (bd->zone->desk_x_count * bd->zone->desk_y_count))
 	  {
 	     E_Desk *desk;
 
@@ -4942,11 +4942,11 @@ _e_border_cb_desktop_change(void *data, int ev_type, void *ev)
      {
 	ecore_x_netwm_desktop_set(e->win, e->desk);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_sync_alarm(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Border *bd;
    Ecore_X_Event_Sync_Alarm *e;
@@ -4954,7 +4954,7 @@ _e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
    
    e = ev;
    bd = e_border_find_by_alarm(e->alarm);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 
    if (bd->client.netwm.sync.wait)
      bd->client.netwm.sync.wait--;
@@ -5000,11 +5000,11 @@ _e_border_cb_sync_alarm(void *data, int ev_type, void *ev)
    bd->client.netwm.sync.send_time = ecore_loop_time_get();
    _e_border_resize_handle(bd);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_efreet_cache_update(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
 {
    Eina_List *l;
    E_Border *bd;
@@ -5024,11 +5024,11 @@ _e_border_cb_efreet_cache_update(void *data, int ev_type, void *ev)
    e_init_status_set(_("Desktop files scan done"));
    e_init_done();
    */
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_config_icon_theme(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_config_icon_theme(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
 {
    Eina_List *l;
    E_Border *bd;
@@ -5039,22 +5039,22 @@ _e_border_cb_config_icon_theme(void *data, int ev_type, void *ev)
 	bd->changes.icon = 1;
 	bd->changed = 1;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /* FIXME:
  * Using '2' is bad, may change in zone flip code.
  * Calculate pos from e->x and e->y
  */
-static int
-_e_border_cb_pointer_warp(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_border_cb_pointer_warp(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Event_Pointer_Warp *e;
 
    e = ev;
-   if (!move) return 1;
+   if (!move) return ECORE_CALLBACK_PASS_ON;
    e_border_move(move, move->x + (e->curr.x - e->prev.x), move->y + (e->curr.y - e->prev.y));
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -5068,8 +5068,8 @@ _e_border_cb_signal_bind(void *data, Evas_Object *obj, const char *emission, con
 			    emission, source);
 }
 
-static int
-_e_border_cb_mouse_in(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_in(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
    E_Border *bd;
@@ -5107,7 +5107,7 @@ _e_border_cb_mouse_in(void *data, int type, void *event)
 	       details[ev->detail]);
      }
 #endif
-   if (grabbed) return 1;
+   if (grabbed) return ECORE_CALLBACK_PASS_ON;
    if (ev->event_win == bd->win)
      {
 	e_focus_event_mouse_in(bd);
@@ -5117,18 +5117,18 @@ _e_border_cb_mouse_in(void *data, int type, void *event)
        (ev->win != bd->event_win) &&
        (ev->event_win != bd->win) &&
        (ev->event_win != bd->event_win))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 #else
-   if (ev->win != bd->event_win) return 1;
+   if (ev->win != bd->event_win) return ECORE_CALLBACK_PASS_ON;
 #endif
    bd->mouse.current.mx = ev->root.x;
    bd->mouse.current.my = ev->root.y;
    evas_event_feed_mouse_in(bd->bg_evas, ev->time, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_mouse_out(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_out(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Border *bd;
@@ -5166,20 +5166,20 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
 	       details[ev->detail]);
      }
 #endif
-   if (grabbed) return 1;
+   if (grabbed) return ECORE_CALLBACK_PASS_ON;
 #if 0   
    if (ev->event_win == bd->win)
      {
 	if (bd->fullscreen)
-	  return 1;
+	  return ECORE_CALLBACK_PASS_ON;
 	if ((ev->mode == ECORE_X_EVENT_MODE_UNGRAB) &&
 	    (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
-	  return 1;
+	  return ECORE_CALLBACK_PASS_ON;
 	if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
-	  return 1;
+	  return ECORE_CALLBACK_PASS_ON;
 	if ((ev->mode == ECORE_X_EVENT_MODE_NORMAL) &&
 	    (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR))
-	  return 1;
+	  return ECORE_CALLBACK_PASS_ON;
 	e_focus_event_mouse_out(bd);
      }
 #endif   
@@ -5188,20 +5188,20 @@ _e_border_cb_mouse_out(void *data, int type, void *event)
        (ev->win != bd->event_win) &&
        (ev->event_win != bd->win) &&
        (ev->event_win != bd->event_win))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 #else
-   if (ev->win != bd->event_win) return 1;
+   if (ev->win != bd->event_win) return ECORE_CALLBACK_PASS_ON;
 #endif
    bd->mouse.current.mx = ev->root.x;
    bd->mouse.current.my = ev->root.y;
    if (ev->mode == ECORE_X_EVENT_MODE_GRAB)
      evas_event_feed_mouse_cancel(bd->bg_evas, ev->time, NULL);
    evas_event_feed_mouse_out(bd->bg_evas, ev->time, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_wheel(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    E_Border *bd;
@@ -5217,11 +5217,11 @@ _e_border_cb_mouse_wheel(void *data, int type, void *event)
 					E_OBJECT(bd), ev);
      }
    evas_event_feed_mouse_wheel(bd->bg_evas, ev->direction, ev->z, ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_down(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Border *bd;
@@ -5306,11 +5306,11 @@ _e_border_cb_mouse_down(void *data, int type, void *event)
 	if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
 	evas_event_feed_mouse_down(bd->bg_evas, ev->buttons, flags, ev->timestamp, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Border *bd;
@@ -5345,7 +5345,7 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
 	       e_focus_event_mouse_up(bd);
 	  }
      }
-   if (ev->window != bd->event_win) return 1;
+   if (ev->window != bd->event_win) return ECORE_CALLBACK_PASS_ON;
    if ((ev->buttons >= 1) && (ev->buttons <= 3))
      {
 	bd->mouse.last_up[ev->buttons - 1].mx = ev->root.x;
@@ -5359,11 +5359,11 @@ _e_border_cb_mouse_up(void *data, int type, void *event)
    bd->drag.start = 0;
 
    evas_event_feed_mouse_up(bd->bg_evas, ev->buttons, EVAS_BUTTON_NONE, ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_border_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_border_cb_mouse_move(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    E_Border *bd;
@@ -5371,7 +5371,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
    ev = event;
    bd = data;
    if ((ev->window != bd->event_win) &&
-       (ev->event_window != bd->win)) return 1;
+       (ev->event_window != bd->win)) return ECORE_CALLBACK_PASS_ON;
    bd->mouse.current.mx = ev->root.x;
    bd->mouse.current.my = ev->root.y;
    if (bd->moving)
@@ -5385,7 +5385,7 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 	  bd->client.netwm.sync.wait = 0;
 	if ((bd->client.netwm.sync.request) &&
 	    (bd->client.netwm.sync.alarm) &&
-	    (bd->client.netwm.sync.wait > 1)) return 1;
+	    (bd->client.netwm.sync.wait > 1)) return ECORE_CALLBACK_PASS_ON;
 #endif
 	if ((bd->moveinfo.down.button >= 1) && (bd->moveinfo.down.button <= 3))
 	  {
@@ -5499,14 +5499,14 @@ _e_border_cb_mouse_move(void *data, int type, void *event)
 	  }
 	evas_event_feed_mouse_move(bd->bg_evas, ev->x, ev->y, ev->timestamp, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_border_cb_grab_replay(void *data, int type, void *event)
 { 
    Ecore_Event_Mouse_Button *ev;
-   if (type != ECORE_EVENT_MOUSE_BUTTON_DOWN) return 0;
+   if (type != ECORE_EVENT_MOUSE_BUTTON_DOWN) return ECORE_CALLBACK_DONE;
    
    ev = event;
    if ((e_config->pass_click_on) || (e_config->always_click_to_raise) ||
@@ -5518,16 +5518,16 @@ _e_border_cb_grab_replay(void *data, int type, void *event)
 	if (bd)
 	  {
 	     if (bd->cur_mouse_action)
-	       return 0;
+	       return ECORE_CALLBACK_DONE;
 	     if (ev->event_window == bd->win)
 	       {
 		  if (!e_bindings_mouse_down_find(E_BINDING_CONTEXT_BORDER,
 						  E_OBJECT(bd), ev, NULL))
-		    return 1;
+		    return ECORE_CALLBACK_PASS_ON;
 	       }
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 static void
@@ -5540,7 +5540,7 @@ _e_border_cb_drag_finished(E_Drag *drag, int dropped)
    drag_border = NULL;
 }
 
-static int
+static Eina_Bool
 _e_border_post_move_resize_job(void *data)
 {
    E_Border *bd;
@@ -5569,7 +5569,7 @@ _e_border_post_move_resize_job(void *data)
    bd->post_move = 0;
    bd->post_resize = 0;
    bd->post_job = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -6068,8 +6068,8 @@ _e_border_eval0(E_Border *bd)
 	     if ((num == 1) &&
 		 (rects[0].x == 0) &&
 		 (rects[0].y == 0) &&
-		 (rects[0].width == cw) &&
-		 (rects[0].height == ch))
+		 ((int) rects[0].width == cw) &&
+		 ((int) rects[0].height == ch))
 	       {
 		  if (bd->client.shaped)
 		    {
@@ -6855,14 +6855,14 @@ _e_border_eval(E_Border *bd)
 			    rects[i].width -= rects[i].x;
 			    rects[i].x = 0;
 			 }
-		       if ((rects[i].x + rects[i].width) > bd->w)
+		       if ((rects[i].x + (int) rects[i].width) > bd->w)
 			 rects[i].width = rects[i].width - rects[i].x;
 		       if (rects[i].y < 0)
 			 {
 			    rects[i].height -= rects[i].y;
 			    rects[i].y = 0;
 			 }
-		       if ((rects[i].y + rects[i].height) > bd->h)
+		       if ((rects[i].y + (int) rects[i].height) > bd->h)
 			 rects[i].height = rects[i].height - rects[i].y;
 		       
 		       if ((orects[i].x != rects[i].x) ||
@@ -7225,7 +7225,7 @@ _e_border_resize_handle(E_Border *bd)
    e_border_move_resize(bd, new_x, new_y, new_w, new_h);
 }
 
-static int
+static Eina_Bool
 _e_border_shade_animator(void *data)
 {
    E_Border *bd = data;
@@ -7323,13 +7323,13 @@ _e_border_shade_animator(void *data)
 	e_object_ref(E_OBJECT(bd));
 //	e_object_breadcrumb_add(E_OBJECT(bd), "border_resize_event");
 	ecore_event_add(E_EVENT_BORDER_RESIZE, ev, _e_border_event_border_resize_free, NULL);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
-_e_border_event_border_resize_free(void *data, void *ev)
+_e_border_event_border_resize_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Resize *e;
 
@@ -7340,7 +7340,7 @@ _e_border_event_border_resize_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_move_free(void *data, void *ev)
+_e_border_event_border_move_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Move *e;
 
@@ -7351,7 +7351,7 @@ _e_border_event_border_move_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_add_free(void *data, void *ev)
+_e_border_event_border_add_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Add *e;
 
@@ -7362,7 +7362,7 @@ _e_border_event_border_add_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_remove_free(void *data, void *ev)
+_e_border_event_border_remove_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Remove *e;
 
@@ -7373,7 +7373,7 @@ _e_border_event_border_remove_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_show_free(void *data, void *ev)
+_e_border_event_border_show_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Show *e;
 
@@ -7384,7 +7384,7 @@ _e_border_event_border_show_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_hide_free(void *data, void *ev)
+_e_border_event_border_hide_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Hide *e;
 
@@ -7395,7 +7395,7 @@ _e_border_event_border_hide_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_iconify_free(void *data, void *ev)
+_e_border_event_border_iconify_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Iconify *e;
 
@@ -7406,7 +7406,7 @@ _e_border_event_border_iconify_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_uniconify_free(void *data, void *ev)
+_e_border_event_border_uniconify_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Uniconify *e;
 
@@ -7417,7 +7417,7 @@ _e_border_event_border_uniconify_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_stick_free(void *data, void *ev)
+_e_border_event_border_stick_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Stick *e;
 
@@ -7428,7 +7428,7 @@ _e_border_event_border_stick_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_unstick_free(void *data, void *ev)
+_e_border_event_border_unstick_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Unstick *e;
 
@@ -7439,7 +7439,7 @@ _e_border_event_border_unstick_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_zone_set_free(void *data, void *ev)
+_e_border_event_border_zone_set_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Zone_Set *e;
 
@@ -7451,7 +7451,7 @@ _e_border_event_border_zone_set_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_desk_set_free(void *data, void *ev)
+_e_border_event_border_desk_set_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Desk_Set *e;
 
@@ -7463,7 +7463,7 @@ _e_border_event_border_desk_set_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_stack_free(void *data, void *ev)
+_e_border_event_border_stack_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Stack *e;
 
@@ -7479,7 +7479,7 @@ _e_border_event_border_stack_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_icon_change_free(void *data, void *ev)
+_e_border_event_border_icon_change_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Icon_Change *e;
 
@@ -7490,7 +7490,7 @@ _e_border_event_border_icon_change_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_urgent_change_free(void *data, void *ev)
+_e_border_event_border_urgent_change_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Urgent_Change *e;
 
@@ -7500,7 +7500,7 @@ _e_border_event_border_urgent_change_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_focus_in_free(void *data, void *ev)
+_e_border_event_border_focus_in_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Focus_In *e;
 
@@ -7510,7 +7510,7 @@ _e_border_event_border_focus_in_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_focus_out_free(void *data, void *ev)
+_e_border_event_border_focus_out_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Focus_Out *e;
 
@@ -7520,7 +7520,7 @@ _e_border_event_border_focus_out_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_property_free(void *data, void *ev)
+_e_border_event_border_property_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Property *e;
 
@@ -7530,7 +7530,7 @@ _e_border_event_border_property_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_fullscreen_free(void *data, void *ev)
+_e_border_event_border_fullscreen_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Fullscreen *e;
 
@@ -7541,7 +7541,7 @@ _e_border_event_border_fullscreen_free(void *data, void *ev)
 }
 
 static void
-_e_border_event_border_unfullscreen_free(void *data, void *ev)
+_e_border_event_border_unfullscreen_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Border_Unfullscreen *e;
 
@@ -7716,7 +7716,7 @@ _e_border_move_update(E_Border *bd)
    _e_border_hook_call(E_BORDER_HOOK_MOVE_UPDATE, bd);
 }
 
-static int
+static Eina_Bool
 _e_border_cb_ping_poller(void *data)
 {
    E_Border *bd;
@@ -7751,10 +7751,10 @@ _e_border_cb_ping_poller(void *data)
      }
    bd->ping_poller = NULL;
    e_border_ping(bd);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_border_cb_kill_timer(void *data)
 {
    E_Border *bd;
@@ -7766,7 +7766,7 @@ _e_border_cb_kill_timer(void *data)
 	  kill(bd->client.netwm.pid, SIGKILL);
      }
    bd->kill_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -7958,8 +7958,8 @@ e_border_under_pointer_get(E_Desk *desk, E_Border *exclude)
    return bd;
 }
 
-static int
-_e_border_pointer_warp_to_center_timer(void *data)
+static Eina_Bool
+_e_border_pointer_warp_to_center_timer(__UNUSED__ void *data)
 {
    if (warp_to)
      {
@@ -7990,12 +7990,12 @@ _e_border_pointer_warp_to_center_timer(void *data)
 	     goto cleanup;
 	  }
 	ecore_x_pointer_warp(warp_to_win, warp_x, warp_y);
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
    cleanup:
    ecore_timer_del(warp_timer);
    warp_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 EAPI int
diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 5b6a6c011..7392ac494 100644
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -127,7 +127,7 @@ typedef struct _E_Event_Border_Simple        E_Event_Border_Unfullscreen;
 #ifndef E_BORDER_H
 #define E_BORDER_H
 
-#define E_BORDER_TYPE 0xE0b01002
+#define E_BORDER_TYPE (int) 0xE0b01002
 
 struct _E_Border
 {
diff --git a/src/bin/e_box.c b/src/bin/e_box.c
index cee34d772..d7e60326c 100644
--- a/src/bin/e_box.c
+++ b/src/bin/e_box.c
@@ -652,6 +652,9 @@ _e_box_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_canvas.c b/src/bin/e_canvas.c
index ec7471890..6ecd0a4f5 100644
--- a/src/bin/e_canvas.c
+++ b/src/bin/e_canvas.c
@@ -4,7 +4,7 @@
 #include "e.h"
 
 /* local subsystem functions */
-static int _e_canvas_cb_flush(void *data);
+static Eina_Bool _e_canvas_cb_flush(void *data);
 
 /* local subsystem globals */
 static Eina_List *_e_canvases = NULL;
@@ -233,10 +233,10 @@ e_canvas_new(int engine_hint, Ecore_X_Window win, int x, int y, int w, int h,
 }
 
 /* local subsystem functions */
-static int
-_e_canvas_cb_flush(void *data)
+static Eina_Bool
+_e_canvas_cb_flush(__UNUSED__ void *data)
 {
    e_canvas_cache_flush();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index b2673a611..9639e1d41 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -16,7 +16,7 @@ static int _e_config_revisions = 0;
 /* local subsystem functions */
 static void _e_config_save_cb(void *data);
 static void _e_config_free(E_Config *cfg);
-static int _e_config_cb_timer(void *data);
+static Eina_Bool _e_config_cb_timer(void *data);
 static int _e_config_eet_close_handle(Eet_File *ef, char *file);
 static void _e_config_acpi_bindings_add(void);
 
@@ -1830,7 +1830,7 @@ _e_config_free(E_Config *ecf)
    E_FREE(ecf);
 }
 
-static int
+static Eina_Bool
 _e_config_cb_timer(void *data)
 {
    e_util_dialog_show(_("Settings Upgraded"), "%s", (char *)data);
diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 393ce1153..69ae30465 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -6,7 +6,7 @@
 /* local subsystem functions */
 static void _e_config_dialog_free(E_Config_Dialog *cfd);
 static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type);
-static int  _e_config_dialog_cb_auto_apply_timer(void *data);
+static Eina_Bool _e_config_dialog_cb_auto_apply_timer(void *data);
 static void _e_config_dialog_cb_dialog_del(void *obj);
 static void _e_config_dialog_cb_ok(void *data, E_Dialog *dia);
 static void _e_config_dialog_cb_apply(void *data, E_Dialog *dia);
@@ -285,7 +285,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
    if (cfd->icon) e_dialog_border_icon_set(cfd->dia, cfd->icon);
 }
 
-static int
+static Eina_Bool
 _e_config_dialog_cb_auto_apply_timer(void *data)
 {
    E_Config_Dialog *cfd;
@@ -305,7 +305,7 @@ _e_config_dialog_cb_auto_apply_timer(void *data)
 	if (cfd->view->advanced.apply_cfdata)
 	  cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index f207246f4..63d99c37b 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -4,7 +4,7 @@
 #include "e.h"
 
 static void _e_configure_efreet_desktop_update(void);
-static int _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
+static Eina_Bool _e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event);
 static void _e_configure_registry_item_full_add(const char *path, int pri, const char *label, const char *icon_file, const char *icon, E_Config_Dialog *(*func) (E_Container *con, const char *params), void (*generic_func) (E_Container *con, const char *params), Efreet_Desktop *desktop);
 
 EAPI Eina_List *e_configure_registry = NULL;
@@ -177,8 +177,8 @@ _e_configure_efreet_desktop_update(void)
       efreet_desktop_free(desktop);
 }
 
-static int
-_e_configure_cb_efreet_desktop_cache_update(void *data, int type, void *event)
+static Eina_Bool
+_e_configure_cb_efreet_desktop_cache_update(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    _e_configure_efreet_desktop_update();
    return 1;
diff --git a/src/bin/e_container.c b/src/bin/e_container.c
index a6f0c91c8..9ae6a734d 100644
--- a/src/bin/e_container.c
+++ b/src/bin/e_container.c
@@ -15,12 +15,12 @@ static void _e_container_free(E_Container *con);
 
 static E_Container *_e_container_find_by_event_window(Ecore_X_Window win);
 
-static int  _e_container_cb_mouse_in(void *data, int type, void *event);
-static int  _e_container_cb_mouse_out(void *data, int type, void *event);
-static int  _e_container_cb_mouse_down(void *data, int type, void *event);
-static int  _e_container_cb_mouse_up(void *data, int type, void *event);
-static int  _e_container_cb_mouse_move(void *data, int type, void *event);
-static int  _e_container_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_in(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_out(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool  _e_container_cb_mouse_wheel(void *data, int type, void *event);
 
 static void _e_container_shape_del(E_Container_Shape *es);
 static void _e_container_shape_free(E_Container_Shape *es);
@@ -247,7 +247,7 @@ e_container_number_get(E_Manager *man, int num)
    E_OBJECT_TYPE_CHECK_RETURN(man, E_MANAGER_TYPE, NULL);
    EINA_LIST_FOREACH(man->containers, l, con)
      {
-	if (con->num == num) return con;
+	if ((int) con->num == num) return con;
      }
    return NULL;
 }
@@ -338,7 +338,7 @@ e_container_zone_number_get(E_Container *con, int num)
    E_OBJECT_TYPE_CHECK_RETURN(con, E_CONTAINER_TYPE, NULL);
    EINA_LIST_FOREACH(con->zones, l, zone)
      {
-	if (zone->num == num) return zone;
+	if ((int) zone->num == num) return zone;
      }
    return NULL;
 }
@@ -503,8 +503,8 @@ e_container_shape_rects_set(E_Container_Shape *es, Ecore_X_Rectangle *rects, int
    if ((rects) && (num == 1) &&
        (rects[0].x == 0) &&
        (rects[0].y == 0) &&
-       (rects[0].width == es->w) &&
-       (rects[0].height == es->h))
+       ((int) rects[0].width == es->w) &&
+       ((int) rects[0].height == es->h))
      {
 	/* do nothing */
      }
@@ -968,8 +968,8 @@ _e_container_find_by_event_window(Ecore_X_Window win)
    return NULL;
 }
 
-static int
-_e_container_cb_mouse_in(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
    E_Border *bd;
@@ -984,11 +984,11 @@ _e_container_cb_mouse_in(void *data, int type, void *event)
 	ecore_event_evas_modifier_lock_update(con->bg_evas, ev->modifiers);
 	evas_event_feed_mouse_in(con->bg_evas, ev->time, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_container_cb_mouse_out(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Container *con;
@@ -1002,11 +1002,11 @@ _e_container_cb_mouse_out(void *data, int type, void *event)
 	  evas_event_feed_mouse_cancel(con->bg_evas, ev->time, NULL);
         evas_event_feed_mouse_out(con->bg_evas, ev->time, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_container_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Container *con;
@@ -1024,11 +1024,11 @@ _e_container_cb_mouse_down(void *data, int type, void *event)
 	ecore_event_evas_modifier_lock_update(con->bg_evas, ev->modifiers);
 	evas_event_feed_mouse_down(con->bg_evas, ev->buttons, flags, ev->timestamp, NULL);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_container_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Container *con;
@@ -1042,11 +1042,11 @@ _e_container_cb_mouse_up(void *data, int type, void *event)
 	e_bindings_mouse_up_event_handle(E_BINDING_CONTEXT_CONTAINER,
 					 E_OBJECT(con), ev);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_container_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    E_Container *con;
@@ -1061,8 +1061,8 @@ _e_container_cb_mouse_move(void *data, int type, void *event)
    return 1;
 }
 
-static int
-_e_container_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_e_container_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    E_Container *con;
@@ -1078,7 +1078,7 @@ _e_container_cb_mouse_wheel(void *data, int type, void *event)
 	     evas_event_feed_mouse_wheel(con->bg_evas, ev->direction, ev->z, ev->timestamp, NULL);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1228,7 +1228,7 @@ _e_container_resize_handle(E_Container *con)
 }
 
 static void
-_e_container_event_container_resize_free(void *data, void *ev)
+_e_container_event_container_resize_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Container_Resize *e;
 
diff --git a/src/bin/e_container.h b/src/bin/e_container.h
index 3d1931ede..86051d09f 100644
--- a/src/bin/e_container.h
+++ b/src/bin/e_container.h
@@ -24,8 +24,8 @@ typedef struct _E_Event_Container_Resize   E_Event_Container_Resize;
 #ifndef E_CONTAINER_H
 #define E_CONTAINER_H
 
-#define E_CONTAINER_TYPE 0xE0b01003
-#define E_CONTAINER_SHAPE_TYPE 0xE0b01004
+#define E_CONTAINER_TYPE (int) 0xE0b01003
+#define E_CONTAINER_SHAPE_TYPE (int) 0xE0b01004
 
 struct _E_Container
 {
diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 7334d4d70..85e50e85d 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -16,10 +16,10 @@ static void _e_desk_event_desk_deskshow_free(void *data, void *ev);
 static void _e_desk_event_desk_name_change_free(void *data, void *ev);
 static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
 static void _e_desk_show_end(E_Desk *desk);
-static int _e_desk_show_animator(void *data);
+static Eina_Bool _e_desk_show_animator(void *data);
 static void _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy);
 static void _e_desk_hide_end(E_Desk *desk);
-static int _e_desk_hide_animator(void *data);
+static Eina_Bool _e_desk_hide_animator(void *data);
 
 EAPI int E_EVENT_DESK_SHOW = 0;
 EAPI int E_EVENT_DESK_BEFORE_SHOW = 0;
@@ -68,9 +68,9 @@ e_desk_new(E_Zone *zone, int x, int y)
    EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
      {
 	if ((cfname->container >= 0) &&
-	    (zone->container->num != cfname->container)) continue;
+	    ((int) zone->container->num != cfname->container)) continue;
 	if ((cfname->zone >= 0) &&
-	    (zone->num != cfname->zone)) continue;
+	    ((int) zone->num != cfname->zone)) continue;
 	if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y)) 
           continue;
 	desk->name = eina_stringshare_add(cfname->name);
@@ -167,9 +167,9 @@ e_desk_name_update(void)
 			    EINA_LIST_FOREACH(e_config->desktop_names, l, cfname)
 			      {
 				 if ((cfname->container >= 0) &&
-				     (con->num != cfname->container)) continue;
+				     ((int) con->num != cfname->container)) continue;
 				 if ((cfname->zone >= 0) &&
-	    			     (zone->num != cfname->zone)) continue;
+	    			     ((int) zone->num != cfname->zone)) continue;
 				 if ((cfname->desk_x != d_x) || 
 				     (cfname->desk_y != d_y)) continue;
 				 e_desk_name_set(desk,cfname->name);
@@ -294,7 +294,7 @@ e_desk_show(E_Desk *desk)
 	if (!cf_es) continue;
 
 	zone = e_util_zone_current_get(e_manager_current_get());
-	if (cf_es->zone != zone->num) continue;
+	if (cf_es->zone != (int) zone->num) continue;
 
 	EINA_LIST_FOREACH(es->cfg->desk_list, ll, sd)
 	  {
@@ -521,7 +521,7 @@ _e_desk_free(E_Desk *desk)
 }
 
 static void
-_e_desk_event_desk_show_free(void *data, void *event)
+_e_desk_event_desk_show_free(__UNUSED__ void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -531,7 +531,7 @@ _e_desk_event_desk_show_free(void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_before_show_free(void *data, void *event)
+_e_desk_event_desk_before_show_free(__UNUSED__ void *data, void *event)
 {
    E_Event_Desk_Before_Show *ev;
 
@@ -541,7 +541,7 @@ _e_desk_event_desk_before_show_free(void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_after_show_free(void *data, void *event)
+_e_desk_event_desk_after_show_free(__UNUSED__ void *data, void *event)
 {
    E_Event_Desk_After_Show *ev;
 
@@ -551,7 +551,7 @@ _e_desk_event_desk_after_show_free(void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_deskshow_free(void *data, void *event)
+_e_desk_event_desk_deskshow_free(__UNUSED__ void *data, void *event)
 {
    E_Event_Desk_Show *ev;
 
@@ -561,7 +561,7 @@ _e_desk_event_desk_deskshow_free(void *data, void *event)
 }
 
 static void
-_e_desk_event_desk_name_change_free(void *data, void *event)
+_e_desk_event_desk_name_change_free(__UNUSED__ void *data, void *event)
 {
    E_Event_Desk_Name_Change *ev;
 
@@ -670,7 +670,7 @@ _e_desk_show_end(E_Desk *desk)
 		   _e_desk_event_desk_after_show_free, NULL);
 }
 
-static int
+static Eina_Bool
 _e_desk_show_animator(void *data)
 {
    E_Desk *desk;
@@ -707,9 +707,9 @@ _e_desk_show_animator(void *data)
      {
 	_e_desk_show_end(desk);
 	desk->animator = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -806,7 +806,7 @@ _e_desk_hide_end(E_Desk *desk)
    ecore_x_window_shadow_tree_flush();
 }
 
-static int
+static Eina_Bool
 _e_desk_hide_animator(void *data)
 {
    E_Desk *desk;
@@ -842,7 +842,7 @@ _e_desk_hide_animator(void *data)
      {
 	_e_desk_hide_end(desk);
 	desk->animator = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index c9c7a07e9..4952412b4 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -70,13 +70,13 @@ static int _e_desklock_fullscreen_count = 0;
 
 /***********************************************************************/
 
-static int _e_desklock_cb_key_down(void *data, int type, void *event);
-static int _e_desklock_cb_mouse_down(void *data, int type, void *event);
-static int _e_desklock_cb_mouse_up(void *data, int type, void *event);
-static int _e_desklock_cb_mouse_wheel(void *data, int type, void *event);
-static int _e_desklock_cb_mouse_move(void *data, int type, void *event);
-static int _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
-static int _e_desklock_cb_idle_poller(void *data);
+static Eina_Bool _e_desklock_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_idle_poller(void *data);
 
 static void _e_desklock_null(void);
 static void _e_desklock_passwd_update(void);
@@ -87,7 +87,7 @@ static int _e_desklock_check_auth(void);
 static void _e_desklock_state_set(int state);
 
 #ifdef HAVE_PAM
-static int _e_desklock_cb_exit(void *data, int type, void *event);
+static Eina_Bool _e_desklock_cb_exit(void *data, int type, void *event);
 static int _desklock_auth(char *passwd);
 static int _desklock_pam_init(E_Desklock_Auth *da);
 static int _desklock_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
@@ -96,8 +96,8 @@ static char *_desklock_auth_get_current_host(void);
 #endif
 
 static void _e_desklock_ask_presentation_mode(void);
-static int _e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
-static int _e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
+static Eina_Bool _e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
+static Eina_Bool _e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
 
 EAPI int E_EVENT_DESKLOCK = 0;
 
@@ -479,7 +479,7 @@ e_desklock_hide(void)
      }
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -510,28 +510,28 @@ _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Desklock_Popup_Data *edp;
@@ -541,7 +541,7 @@ _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *even
    current_zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
 
    if (current_zone == last_active_zone)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
      {
@@ -553,7 +553,7 @@ _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *even
 	  evas_object_show(edp->login_box);
      }
    last_active_zone = current_zone;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -690,7 +690,7 @@ _e_desklock_state_set(int state)
 
 
 #ifdef HAVE_PAM
-static int
+static Eina_Bool
 _e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev = event;
@@ -726,7 +726,7 @@ _e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 	if (_e_desklock_exit_handler) ecore_event_handler_del(_e_desklock_exit_handler);
 	_e_desklock_exit_handler = NULL;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int
@@ -907,11 +907,11 @@ _desklock_auth_get_current_host(void)
 }
 #endif
 
-static int
+static Eina_Bool
 _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev = event;
-   if (ev->exe != _e_custom_desklock_exe) return 1;
+   if (ev->exe != _e_custom_desklock_exe) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->exit_code != 0)
      {
@@ -920,10 +920,10 @@ _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__,
 
    e_desklock_hide();
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
+static Eina_Bool
 _e_desklock_cb_idle_poller(void *data __UNUSED__)
 {
    if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation) &&
@@ -932,7 +932,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
 	double idle, max;
 
 	/* If a desklock is already up, bail */
-        if ((_e_custom_desklock_exe) || (edd)) return 1;
+        if ((_e_custom_desklock_exe) || (edd)) return ECORE_CALLBACK_RENEW;
 
 	idle = ecore_x_screensaver_idle_time_get();
 	max = e_config->desklock_autolock_idle_timeout;
@@ -962,7 +962,7 @@ _e_desklock_cb_idle_poller(void *data __UNUSED__)
      }
 
    /* Make sure our poller persists. */
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -1075,19 +1075,19 @@ _e_desklock_ask_presentation_mode(void)
    _e_desklock_ask_presentation_dia = dia;
 }
 
-static int
+static Eina_Bool
 _e_desklock_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_desklock_fullscreen_count++;
    if (_e_desklock_fullscreen_count == 1) e_desklock_init();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_desklock_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_desklock_fullscreen_count--;
    if (_e_desklock_fullscreen_count == 0) e_desklock_init();
    else if (_e_desklock_fullscreen_count < 0) _e_desklock_fullscreen_count = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c
index 236c5c0a1..36cd100bf 100644
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@@ -28,19 +28,19 @@ static void _e_drag_end(Ecore_X_Window root, int x, int y);
 static void _e_drag_xdnd_end(Ecore_X_Window root, int x, int y);
 static void _e_drag_free(E_Drag *drag);
 
-static int  _e_dnd_cb_window_shape(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_window_shape(void *data, int type, void *event);
 
-static int  _e_dnd_cb_key_down(void *data, int type, void *event);
-static int  _e_dnd_cb_key_up(void *data, int type, void *event);
-static int  _e_dnd_cb_mouse_up(void *data, int type, void *event);
-static int  _e_dnd_cb_mouse_move(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_enter(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_leave(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_position(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_status(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_finished(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_drop(void *data, int type, void *event);
-static int  _e_dnd_cb_event_dnd_selection(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_key_down(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_key_up(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_enter(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_leave(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_position(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_status(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_finished(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_drop(void *data, int type, void *event);
+static Eina_Bool  _e_dnd_cb_event_dnd_selection(void *data, int type, void *event);
 
 /* local subsystem globals */
 
@@ -157,7 +157,7 @@ e_drag_new(E_Container *container, int x, int y,
 	   void (*finished_cb)(E_Drag *drag, int dropped))
 {
    E_Drag *drag;
-   int i;
+   unsigned int i;
 
    /* No need to create a drag object without type */
    if ((!types) || (!num_types)) return NULL;
@@ -298,7 +298,7 @@ e_drag_start(E_Drag *drag, int x, int y)
 
    EINA_LIST_FOREACH(_drop_handlers, l, h)
      {
-	int i, j;
+	unsigned int i, j;
 
 	h->active = 0;
 	eina_stringshare_del(h->active_type);
@@ -366,7 +366,7 @@ e_drop_handler_add(E_Object *obj,
 		   const char **types, unsigned int num_types, int x, int y, int w, int h)
 {
    E_Drop_Handler *handler;
-   int i;
+   unsigned int i;
 
    handler = calloc(1, sizeof(E_Drop_Handler) + num_types * sizeof(char *));
    if (!handler) return NULL;
@@ -413,7 +413,7 @@ e_drop_inside(const E_Drop_Handler *handler, int x, int y)
 EAPI void
 e_drop_handler_del(E_Drop_Handler *handler)
 {
-   int i;
+   unsigned int i;
 
    _drop_handlers = eina_list_remove(_drop_handlers, handler);
    for (i = 0; i < handler->num_types; i++)
@@ -1039,7 +1039,7 @@ _e_drag_xdnd_end(Ecore_X_Window win, int x, int y)
 static void
 _e_drag_free(E_Drag *drag)
 {
-   int i;
+   unsigned int i;
 
    if (drag == _drag_current)
      {
@@ -1086,8 +1086,8 @@ _e_drag_free(E_Drag *drag)
 }
 
 
-static int
-_e_dnd_cb_window_shape(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_dnd_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    Ecore_X_Event_Window_Shape *e = ev;
    const Eina_List *l;
@@ -1098,81 +1098,82 @@ _e_dnd_cb_window_shape(void *data, int ev_type, void *ev)
 	if (drag->evas_win == e->win)
 	  drag->need_shape_export = 1;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->window != _drag_win) return 1;
+   if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
 
-   if (!_drag_current) return 1;
+   if (!_drag_current) return ECORE_CALLBACK_PASS_ON;
 
    if (_drag_current->cb.key_down)
      _drag_current->cb.key_down(_drag_current, ev);
-   
-   return 1;
+
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_key_up(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->window != _drag_win) return 1;
+   if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
 
-   if (!_drag_current) return 1;
+   if (!_drag_current) return ECORE_CALLBACK_PASS_ON;
 
    if (_drag_current->cb.key_up)
      _drag_current->cb.key_up(_drag_current, ev);
-   
-   return 1;
+
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
 
    ev = event;
-   if (ev->window != _drag_win) return 1;
+   if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
 
    _e_drag_end(_drag_win_root, ev->x, ev->y);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
 
    ev = event;
-   if (ev->window != _drag_win) return 1;
+   if (ev->window != _drag_win) return ECORE_CALLBACK_PASS_ON;
 
    if (!_xdnd) 
      _e_drag_update(_drag_win_root, ev->x, ev->y, 
                     ECORE_X_ATOM_XDND_ACTION_PRIVATE);
-   
-   return 1;
+
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_enter(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Enter *ev;
    E_Drop_Handler *h;
    const char *id;
    const Eina_List *l;
-   int i, j;
+   unsigned int j;
+   int i;
 
    ev = event;
    id = e_util_winid_str_get(ev->win);
-   if (!eina_hash_find(_drop_win_hash, id)) return 1;
+   if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
 
    EINA_LIST_FOREACH(_drop_handlers, l, h)
      {
@@ -1223,11 +1224,11 @@ _e_dnd_cb_event_dnd_enter(void *data, int type, void *event)
 	  }
 #endif
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_leave(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Leave *ev;
    E_Event_Dnd_Leave leave_ev;
@@ -1237,7 +1238,7 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
    ev = event;
 
    id = e_util_winid_str_get(ev->win);
-   if (!eina_hash_find(_drop_win_hash, id)) return 1;
+   if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
 
    leave_ev.x = 0;
    leave_ev.y = 0;
@@ -1261,11 +1262,11 @@ _e_dnd_cb_event_dnd_leave(void *data, int type, void *event)
 	eina_stringshare_del(_xdnd->type);
         E_FREE(_xdnd);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_position(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_position(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Position *ev;
    Ecore_X_Rectangle rect;
@@ -1283,7 +1284,7 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
      {
 //	double t2 = ecore_time_get() - t1; ////
 //	printf("DND POS EV 1 %3.7f\n", t2); ////
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 
    rect.x = 0;
@@ -1312,27 +1313,27 @@ _e_dnd_cb_event_dnd_position(void *data, int type, void *event)
      }
 //   double t2 = ecore_time_get() - t1; ////
 //   printf("DND POS EV 2 %3.7f\n", t2); ////
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_status(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_status(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Status *ev;
 
    ev = event;
-   if (ev->win != _drag_win) return 1;
-   return 1;
+   if (ev->win != _drag_win) return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_finished(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_finished(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Finished *ev;
 
    ev = event;
 
-   if (!ev->completed) return 1;
+   if (!ev->completed) return ECORE_CALLBACK_PASS_ON;
 
    if (_drag_current)
      {
@@ -1346,29 +1347,29 @@ _e_dnd_cb_event_dnd_finished(void *data, int type, void *event)
    ecore_x_window_free(_drag_win);
    _drag_win = 0;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_drop(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_drop(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Xdnd_Drop *ev;
    const char *id;
 
    ev = event;
    id = e_util_winid_str_get(ev->win);
-   if (!eina_hash_find(_drop_win_hash, id)) return 1;
+   if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
 
    ecore_x_selection_xdnd_request(ev->win, _xdnd->type);
 
    _xdnd->x = ev->position.x;
    _xdnd->y = ev->position.y;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
+static Eina_Bool
+_e_dnd_cb_event_dnd_selection(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Selection_Notify *ev;
    const char *id;
@@ -1376,8 +1377,8 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
 
    ev = event;
    id = e_util_winid_str_get(ev->win);
-   if (!eina_hash_find(_drop_win_hash, id)) return 1;
-   if (ev->selection != ECORE_X_SELECTION_XDND) return 1;
+   if (!eina_hash_find(_drop_win_hash, id)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->selection != ECORE_X_SELECTION_XDND) return ECORE_CALLBACK_PASS_ON;
 
    if (_type_text_uri_list == _xdnd->type)
      {
@@ -1447,5 +1448,5 @@ _e_dnd_cb_event_dnd_selection(void *data, int type, void *event)
    ecore_x_dnd_send_finished();
    eina_stringshare_del(_xdnd->type);
    E_FREE(_xdnd);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index 92758004b..edb2d5e03 100644
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -8,28 +8,28 @@ static Ecore_Event_Handler *_e_dpms_handler_border_fullscreen = NULL;
 static Ecore_Event_Handler *_e_dpms_handler_border_unfullscreen = NULL;
 static int _e_dpms_fullscreen_count = 0;
 
-static int
+static Eina_Bool
 _e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    e_dpms_init();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_dpms_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_dpms_fullscreen_count++;
    if (_e_dpms_fullscreen_count == 1) e_dpms_init();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_dpms_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_dpms_fullscreen_count--;
    if (_e_dpms_fullscreen_count == 0) e_dpms_init();
    else if (_e_dpms_fullscreen_count < 0) _e_dpms_fullscreen_count = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 EAPI int
diff --git a/src/bin/e_editable.c b/src/bin/e_editable.c
index 27e84b83a..dedc5074a 100644
--- a/src/bin/e_editable.c
+++ b/src/bin/e_editable.c
@@ -89,6 +89,9 @@ e_editable_add(Evas *evas)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_editable_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_entry.c b/src/bin/e_entry.c
index 2cd37858b..e4e1c4f32 100644
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@@ -37,7 +37,7 @@ static void _e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *even
 static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int _e_entry_x_selection_notify_handler(void *data, int type, void *event);
+static Eina_Bool _e_entry_x_selection_notify_handler(void *data, int type, void *event);
 
 static void _e_entry_x_selection_update(Evas_Object *entry);
 static void _e_entry_key_down_windows(Evas_Object *entry, Evas_Event_Key_Down *event);
@@ -60,8 +60,8 @@ static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
 #ifdef HAVE_ECORE_IMF
 static int _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
-static int _e_entry_cb_imf_event_commit(void *data, int type, void *event);
-static int _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event);
+static Eina_Bool _e_entry_cb_imf_event_commit(void *data, int type, void *event);
+static Eina_Bool _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event);
 #endif
 
 /* local subsystem globals */
@@ -102,6 +102,9 @@ e_entry_add(Evas *evas)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_entry_smart = evas_smart_class_new(&sc);
@@ -342,7 +345,7 @@ e_entry_disable(Evas_Object *entry)
 
 /* Called when a key has been pressed by the user */
 static void
-_e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_key_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
 
@@ -370,7 +373,7 @@ _e_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 /* Called when a key has been released by the user */
 static void
-_e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_key_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
 
@@ -393,7 +396,7 @@ _e_entry_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 /* Called when the entry object is pressed by the mouse */
 static void
-_e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_down_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    Evas_Event_Mouse_Down *event;
@@ -548,7 +551,7 @@ _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 /* Called when the entry object is released by the mouse */
 static void
-_e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_up_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    
@@ -577,7 +580,7 @@ _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 
 /* Called when the mouse moves over the entry object */
 static void
-_e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_entry_mouse_move_cb(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, void *event_info)
 {
    E_Entry_Smart_Data *sd;
    Evas_Event_Mouse_Move *event;
@@ -621,8 +624,8 @@ _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 }
 
 /* Called when the the "selection_notify" event is emitted */
-static int
-_e_entry_x_selection_notify_handler(void *data, int type, void *event)
+static Eina_Bool
+_e_entry_x_selection_notify_handler(void *data, __UNUSED__ int type, void *event)
 {
    Evas_Object *entry;
    E_Entry_Smart_Data *sd;
@@ -663,7 +666,7 @@ _e_entry_x_selection_notify_handler(void *data, int type, void *event)
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
    
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /* Updates the X selection with the selected text of the entry */
@@ -1382,8 +1385,8 @@ static int
    return 1;
 }
 
-static int
-_e_entry_cb_imf_event_commit(void *data, int type, void *event)
+static Eina_Bool
+_e_entry_cb_imf_event_commit(void *data, __UNUSED__ int type, void *event)
 {
    Evas_Object *entry;
    E_Entry_Smart_Data *sd;
@@ -1395,10 +1398,10 @@ _e_entry_cb_imf_event_commit(void *data, int type, void *event)
    int changed = 0;
 
    if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry))))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (sd->imf_context != ev->ctx)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    editable = sd->editable_object;
    cursor_pos = e_editable_cursor_pos_get(editable);
@@ -1414,11 +1417,11 @@ _e_entry_cb_imf_event_commit(void *data, int type, void *event)
    if (changed)
      evas_object_smart_callback_call(entry, "changed", NULL);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
+static Eina_Bool
+_e_entry_cb_imf_event_delete_surrounding(void *data, __UNUSED__ int type, void *event)
 {
    E_Entry_Smart_Data *sd;
    Ecore_IMF_Event_Delete_Surrounding *ev = event;
@@ -1428,7 +1431,7 @@ _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
    sd = data;
 
    if (sd->imf_context != ev->ctx)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    editable = sd->editable_object;
    cursor_pos = e_editable_cursor_pos_get(editable);
@@ -1436,6 +1439,6 @@ _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void *event)
                      cursor_pos + ev->offset,
                      cursor_pos + ev->offset + ev->n_chars);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 #endif
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index 5f1ed90f9..af6dc9f2d 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -42,8 +42,8 @@ struct _E_Config_Dialog_Data
 
 /* local subsystem functions */
 static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining);
-static int _e_exec_cb_expire_timer(void *data);
-static int _e_exec_cb_exit(void *data, int type, void *event);
+static Eina_Bool _e_exec_cb_expire_timer(void *data);
+static Eina_Bool _e_exec_cb_exit(void *data, int type, void *event);
 
 static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
 
@@ -120,7 +120,7 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
 	  inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
 	else 
           inst = efreet_desktop_command_get(desktop, files, 
-                                            _e_exec_cb_exec, launch);
+                                            (Efreet_Desktop_Command_Cb) _e_exec_cb_exec, launch);
      }
    else
      inst = _e_exec_cb_exec(launch, NULL, strdup(exec), 0);
@@ -279,7 +279,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
    return inst;
 }
 
-static int
+static Eina_Bool
 _e_exec_cb_expire_timer(void *data)
 {
    E_Exec_Instance *inst;
@@ -287,7 +287,7 @@ _e_exec_cb_expire_timer(void *data)
    inst = data;
    e_exec_start_pending = eina_list_remove(e_exec_start_pending, inst->desktop);
    inst->expire_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -316,28 +316,28 @@ _e_exec_instance_free(E_Exec_Instance *inst)
 
 
 
-static int
+static Eina_Bool
 _e_exec_cb_instance_finish(void *data)
 {
    _e_exec_instance_free(data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 
-static int
-_e_exec_cb_exit(void *data, int type, void *event)
+static Eina_Bool
+_e_exec_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    E_Exec_Instance *inst;
 
    ev = event;
-   if (!ev->exe) return 1;
+   if (!ev->exe) return ECORE_CALLBACK_PASS_ON;
 //   if (ecore_exe_tag_get(ev->exe)) printf("  tag %s\n", ecore_exe_tag_get(ev->exe));
-   if (!(ecore_exe_tag_get(ev->exe) && 
+   if (!(ecore_exe_tag_get(ev->exe) &&
 	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/exec"))))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    inst = ecore_exe_data_get(ev->exe);
-   if (!inst) return 1;
+   if (!inst) return ECORE_CALLBACK_PASS_ON;
 
    /* /bin/sh uses this if cmd not found */
    if ((ev->exited) &&
@@ -400,7 +400,7 @@ _e_exec_cb_exit(void *data, int type, void *event)
    else
      _e_exec_instance_free(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
diff --git a/src/bin/e_flowlayout.c b/src/bin/e_flowlayout.c
index 2d407de5d..3cd35a601 100644
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@@ -855,7 +855,10 @@ _e_flowlayout_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
-	       NULL
+  	       NULL,
+  	       NULL,
+  	       NULL,
+  	       NULL
 	  };
         _e_smart = evas_smart_class_new(&sc);
      }
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index da13eeb0d..ae4888c69 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -288,8 +288,8 @@ static void _e_fm2_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *ev
 static void _e_fm2_cb_scroll_job(void *data);
 static void _e_fm2_cb_resize_job(void *data);
 static int _e_fm2_cb_icon_sort(const void *data1, const void *data2);
-static int _e_fm2_cb_scan_timer(void *data);
-static int _e_fm2_cb_sort_idler(void *data);
+static Eina_Bool _e_fm2_cb_scan_timer(void *data);
+static Eina_Bool _e_fm2_cb_sort_idler(void *data);
 
 static void _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd);
 
@@ -383,8 +383,8 @@ static void _e_fm2_live_file_changed(Evas_Object *obj, const char *file, E_Fm2_F
 static void _e_fm2_live_process_begin(Evas_Object *obj);
 static void _e_fm2_live_process_end(Evas_Object *obj);
 static void _e_fm2_live_process(Evas_Object *obj);
-static int _e_fm2_cb_live_idler(void *data);
-static int _e_fm2_cb_live_timer(void *data);
+static Eina_Bool _e_fm2_cb_live_idler(void *data);
+static Eina_Bool _e_fm2_cb_live_timer(void *data);
 
 static int _e_fm2_theme_edje_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group);
 static int _e_fm2_theme_edje_icon_object_set(E_Fm2_Smart_Data *sd, Evas_Object *o, const char *category, const char *group);
@@ -565,18 +565,18 @@ _e_fm2_icon_h_get(const E_Fm2_Smart_Data *sd)
    return sd->config->icon.list.h;
 }
 
-static int
+static Eina_Bool
 _e_fm2_mime_flush_cb(void *data __UNUSED__)
 {
    efreet_mime_type_cache_flush();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_fm2_mime_clear_cb(void *data __UNUSED__)
 {
    efreet_mime_type_cache_clear();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -649,16 +649,16 @@ _e_fm2_op_registry_entry_print(const E_Fm2_Op_Registry_Entry *ere)
 	  ere->src, ere->dst);
 }
 
-static int
-_e_fm2_op_registry_entry_add_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm2_op_registry_entry_add_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    printf("E FM OPERATION STARTED: id=%d, op=%d\n", ere->id, ere->op);
    return ECORE_CALLBACK_RENEW;
 }
 
-static int
-_e_fm2_op_registry_entry_del_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm2_op_registry_entry_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    puts("E FM OPERATION FINISHED:");
@@ -667,8 +667,8 @@ _e_fm2_op_registry_entry_del_cb(void *data, int type, void *event)
    return ECORE_CALLBACK_RENEW;
 }
 
-static int
-_e_fm2_op_registry_entry_changed_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm2_op_registry_entry_changed_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    const E_Fm2_Op_Registry_Entry *ere = event;
    puts("E FM OPERATION CHANGED:");
@@ -713,6 +713,9 @@ e_fm2_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_fm2_smart = evas_smart_class_new(&sc);
@@ -2125,7 +2128,7 @@ _e_fm2_icon_imc_get(Evas *evas, const E_Fm2_Icon *ic, const char **type_ret)
    E_Input_Method_Config *imc;
    Efreet_Desktop *desktop;
    Eet_File *imc_ef;
-   Evas_Object *o;
+   Evas_Object *o = NULL;
    char buf[PATH_MAX];
 
    if (!ic->info.file)
@@ -5546,22 +5549,22 @@ _e_fm2_typebuf_match_func(E_Fm2_Icon *ic, void* data)
 	    (e_util_glob_case_match(ic->info.file, tb))));
 }
 
-static int
+static Eina_Bool
 _e_fm_typebuf_timer_cb(void *data)
 {
    Evas_Object *obj = data;
    E_Fm2_Smart_Data *sd;
 
-   if (!data) return 0;
+   if (!data) return ECORE_CALLBACK_CANCEL;
    sd = evas_object_smart_data_get(obj);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
 
-   if (!sd->typebuf_visible) return 0;
+   if (!sd->typebuf_visible) return ECORE_CALLBACK_CANCEL;
 
    _e_fm2_typebuf_hide(obj);
    sd->typebuf.timer = NULL;
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -7352,19 +7355,19 @@ _e_fm2_cb_icon_sort(const void *data1, const void *data2)
    return strcmp(l1, l2);
 }
 
-static int
+static Eina_Bool
 _e_fm2_cb_scan_timer(void *data)
 {
    E_Fm2_Smart_Data *sd;
 
    sd = evas_object_smart_data_get(data);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    _e_fm2_queue_process(data);
    sd->scan_timer = NULL;
    if (!sd->listing)
      {
 	_e_fm2_client_monitor_list_end(data);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    if (sd->busy_count > 0)
      sd->scan_timer = ecore_timer_add(0.2, _e_fm2_cb_scan_timer, sd->obj);
@@ -7373,24 +7376,24 @@ _e_fm2_cb_scan_timer(void *data)
 	if (!sd->sort_idler)
 	  sd->sort_idler = ecore_idler_add(_e_fm2_cb_sort_idler, data);
      }
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_fm2_cb_sort_idler(void *data)
 {
    E_Fm2_Smart_Data *sd;
 
    sd = evas_object_smart_data_get(data);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    _e_fm2_queue_process(data);
    if (!sd->listing)
      {
 	sd->sort_idler = NULL;
         _e_fm2_client_monitor_list_end(data);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /**************************/
@@ -9587,14 +9590,14 @@ _e_fm2_live_process(Evas_Object *obj)
    free(a);
 }
 
-static int
+static Eina_Bool
 _e_fm2_cb_live_idler(void *data)
 {
    E_Fm2_Smart_Data *sd;
    double t;
 
    sd = evas_object_smart_data_get(data);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    t = ecore_time_get();
    do
      {
@@ -9602,7 +9605,7 @@ _e_fm2_cb_live_idler(void *data)
 	_e_fm2_live_process(data);
      }
    while ((ecore_time_get() - t) > 0.02);
-   if (sd->live.actions) return 1;
+   if (sd->live.actions) return ECORE_CALLBACK_RENEW;
    _e_fm2_live_process_end(data);
    _e_fm2_cb_live_timer(data);
    if ((sd->order_file) || (sd->config->view.always_order))
@@ -9610,16 +9613,16 @@ _e_fm2_cb_live_idler(void *data)
 	e_fm2_refresh(data);
      }
    sd->live.idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_fm2_cb_live_timer(void *data)
 {
    E_Fm2_Smart_Data *sd;
 
    sd = evas_object_smart_data_get(data);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    if (sd->queue) _e_fm2_queue_process(data);
    else if (sd->iconlist_changed)
      {
@@ -9637,9 +9640,9 @@ _e_fm2_cb_live_timer(void *data)
      }
    sd->live.deletions = 0;
    sd->live.timer = NULL;
-   if ((!sd->queue) && (!sd->live.idler)) return 0;
+   if ((!sd->queue) && (!sd->live.idler)) return ECORE_CALLBACK_CANCEL;
    sd->live.timer = ecore_timer_add(0.2, _e_fm2_cb_live_timer, data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int
diff --git a/src/bin/e_fm_main.c b/src/bin/e_fm_main.c
index 154a255ec..7b252a230 100644
--- a/src/bin/e_fm_main.c
+++ b/src/bin/e_fm_main.c
@@ -153,9 +153,9 @@ struct _E_Fm_Task
 
 /* local subsystem functions */
 static int _e_ipc_init(void);
-static int _e_ipc_cb_server_add(void *data, int type, void *event);
-static int _e_ipc_cb_server_del(void *data, int type, void *event);
-static int _e_ipc_cb_server_data(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
 
 static void _e_fm_monitor_start(int id, const char *path);
 static void _e_fm_monitor_start_try(E_Fm_Task *task);
@@ -172,12 +172,12 @@ static int _e_client_send(int id, E_Fm_Op_Type type, void *data, int size);
 static int _e_fm_slave_run(E_Fm_Op_Type type, const char *args, int id);
 static E_Fm_Slave *_e_fm_slave_get(int id);
 static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, int size);
-static int _e_fm_slave_data_cb(void *data, int type, void *event);
-static int _e_fm_slave_error_cb(void *data, int type, void *event);
-static int _e_fm_slave_del_cb(void *data, int type, void *event);
+static Eina_Bool _e_fm_slave_data_cb(void *data, int type, void *event);
+static Eina_Bool _e_fm_slave_error_cb(void *data, int type, void *event);
+static Eina_Bool _e_fm_slave_del_cb(void *data, int type, void *event);
 
 static void _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path);
-static int _e_cb_recent_clean(void *data);
+static Eina_Bool _e_cb_recent_clean(void *data);
 
 static void _e_file_add_mod(E_Dir *ed, const char *path, E_Fm_Op_Type op, int listing);
 static void _e_file_add(E_Dir *ed, const char *path, int listing);
@@ -186,8 +186,8 @@ static void _e_file_mod(E_Dir *ed, const char *path);
 static void _e_file_mon_dir_del(E_Dir *ed, const char *path);
 static void _e_file_mon_list_sync(E_Dir *ed);
 
-static int _e_cb_file_mon_list_idler(void *data);
-static int _e_cb_fop_trash_idler(void *data);
+static Eina_Bool _e_cb_file_mon_list_idler(void *data);
+static Eina_Bool _e_cb_fop_trash_idler(void *data);
 static char *_e_str_list_remove(Eina_List **list, char *str);
 static void _e_fm_reorder(const char *file, const char *dst, const char *relative, int after);
 static void _e_dir_del(E_Dir *ed);
@@ -217,15 +217,15 @@ static void _e_dbus_cb_vol_prop_mount_modified(void *data, void *reply_data, DBu
 static void _e_dbus_cb_vol_mounted(void *user_data, void *method_return, DBusError *error);
 static void _e_dbus_cb_vol_unmounted(void *user_data, void *method_return, DBusError *error);
 static void _e_dbus_cb_vol_unmounted_before_eject(void *user_data, void *method_return, DBusError *error);
-static int  _e_dbus_vb_vol_ejecting_after_unmount(void *data);
+static Eina_Bool  _e_dbus_vb_vol_ejecting_after_unmount(void *data);
 static void _e_dbus_cb_vol_ejected(void *user_data, void *method_return, DBusError *error);
 static int  _e_dbus_format_error_msg(char **buf, E_Volume *v, DBusError *error);
 static void _hal_test(void *data, DBusMessage *msg, DBusError *error);
 static void _e_hal_poll(void *data, DBusMessage *msg);
 
-static int  _e_dbus_vol_mount_timeout(void *data);
-static int  _e_dbus_vol_unmount_timeout(void *data);
-static int  _e_dbus_vol_eject_timeout(void *data);
+static Eina_Bool _e_dbus_vol_mount_timeout(void *data);
+static Eina_Bool _e_dbus_vol_unmount_timeout(void *data);
+static Eina_Bool _e_dbus_vol_eject_timeout(void *data);
 
 
 
@@ -954,7 +954,7 @@ e_volume_find(const char *udi)
    return NULL;
 }
 
-static int
+static Eina_Bool
 _e_dbus_vol_mount_timeout(void *data)
 {
    E_Volume *v = data;
@@ -971,7 +971,7 @@ _e_dbus_vol_mount_timeout(void *data)
                          0, 0, 0, buf, size);
    free(buf);
    
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1056,7 +1056,7 @@ e_volume_mount(E_Volume *v)
    eina_list_free(opt);
 }
 
-static int
+static Eina_Bool
 _e_dbus_vol_unmount_timeout(void *data)
 {
    E_Volume *v = data;
@@ -1073,7 +1073,7 @@ _e_dbus_vol_unmount_timeout(void *data)
                          0, 0, 0, buf, size);
    free(buf);
    
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1124,7 +1124,7 @@ e_volume_unmount(E_Volume *v)
                                        _e_dbus_cb_vol_unmounted, v);
 }
 
-static int
+static Eina_Bool
 _e_dbus_vol_eject_timeout(void *data)
 {
    E_Volume *v = data;
@@ -1141,10 +1141,10 @@ _e_dbus_vol_eject_timeout(void *data)
                          0, 0, 0, buf, size);
    free(buf);
    
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_dbus_vb_vol_ejecting_after_unmount(void *data)
 {
    E_Volume *v = data;
@@ -1153,7 +1153,7 @@ _e_dbus_vb_vol_ejecting_after_unmount(void *data)
    v->op = e_hal_device_volume_eject(_e_dbus_conn, v->udi, NULL,
                                      _e_dbus_cb_vol_ejected, v);
    
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1250,8 +1250,8 @@ _e_ipc_init(void)
    return 1;
 }
 
-static int
-_e_ipc_cb_server_add(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Ipc_Event_Server_Add *e;
    
@@ -1260,15 +1260,15 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
 			 6/*E_IPC_DOMAIN_FM*/,
 			 E_FM_OP_HELLO, 
 			 0, 0, 0, NULL, 0); /* send hello */
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_ipc_cb_server_del(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    /* quit now */
    ecore_main_loop_quit();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1583,13 +1583,13 @@ _e_fm_handle_error_response(int id, E_Fm_Op_Type type)
 }
 
 
-static int
+static Eina_Bool
 _e_ipc_cb_server_data(void *data, int type, void *event)
 {
    Ecore_Ipc_Event_Server_Data *e;
    
    e = event;
-   if (e->major != 6/*E_IPC_DOMAIN_FM*/) return 1;
+   if (e->major != 6/*E_IPC_DOMAIN_FM*/) return ECORE_CALLBACK_PASS_ON;
    switch (e->minor)
      {
       case E_FM_OP_MONITOR_START: /* monitor dir (and implicitly list) */
@@ -1782,7 +1782,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
 			 6/*E_IPC_DOMAIN_FM*/,
 			 E_FM_OP_OK,
 			 0, e->ref, 0, NULL, 0);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int _e_client_send(int id, E_Fm_Op_Type type, void *data, int size)
@@ -1854,7 +1854,8 @@ static int _e_fm_slave_send(E_Fm_Slave *slave, E_Fm_Op_Type type, void *data, in
    return result;
 }
 
-static int _e_fm_slave_data_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm_slave_data_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Data *e = event;
    E_Fm_Slave *slave;
@@ -1862,7 +1863,7 @@ static int _e_fm_slave_data_cb(void *data, int type, void *event)
    char *sdata;
    int ssize;
 
-   if (!e) return 1;
+   if (!e) return ECORE_CALLBACK_PASS_ON;
 
    slave = ecore_exe_data_get(e->exe);
 
@@ -1902,10 +1903,11 @@ static int _e_fm_slave_data_cb(void *data, int type, void *event)
 	ssize -= size;
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int _e_fm_slave_error_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm_slave_error_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Data *e = event;
    E_Fm_Slave *slave;
@@ -1919,8 +1921,8 @@ static int _e_fm_slave_error_cb(void *data, int type, void *event)
    return 1;
 }
 
-static int 
-_e_fm_slave_del_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fm_slave_del_cb(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *e = event;
    E_Fm_Slave *slave;
@@ -2012,7 +2014,7 @@ _e_cb_file_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, c
    free(dir);
 }
 
-static int
+static Eina_Bool
 _e_cb_recent_clean(void *data)
 {
    E_Dir *ed;
@@ -2032,9 +2034,9 @@ _e_cb_recent_clean(void *data)
 	     free(m);
 	  }
    ed->cleaning = 0;
-   if (ed->recent_mods) return 1;
+   if (ed->recent_mods) return ECORE_CALLBACK_RENEW;
    ed->recent_clean = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 			       
 
@@ -2181,7 +2183,7 @@ _e_file_mon_list_sync(E_Dir *ed)
 			 0, ed->id, ed->sync, NULL, 0);
 }
 
-static int
+static Eina_Bool
 _e_cb_file_mon_list_idler(void *data)
 {
    E_Dir *ed;
@@ -2217,10 +2219,10 @@ _e_cb_file_mon_list_idler(void *data)
    ed->sync_time = 0.0;
    ed->idler = NULL;
    if (!ed->fq) _e_file_add(ed, "", 2);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_cb_fop_trash_idler(void *data)
 {
    E_Fop *fop = NULL;
@@ -2270,7 +2272,7 @@ _e_cb_fop_trash_idler(void *data)
 	  {
 	     /* Move failed. Spec says delete files that can't be trashed */
 	     ecore_file_unlink(fop->src);
-	     return 0;
+	     return ECORE_CALLBACK_CANCEL;
 	  }
      }
 
@@ -2300,7 +2302,7 @@ _e_cb_fop_trash_idler(void *data)
    eina_stringshare_del(fop->dst);
    free(fop);
    _e_fops = eina_list_remove(_e_fops, fop);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static char *
diff --git a/src/bin/e_fm_op.c b/src/bin/e_fm_op.c
index 8c2056dd3..2bcddc64e 100644
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@@ -60,13 +60,13 @@ static E_Fm_Op_Task *_e_fm_op_task_new();
 static void _e_fm_op_task_free(void *t);
 
 static void _e_fm_op_remove_link_task(E_Fm_Op_Task *task);
-static int _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler);
+static Eina_Bool _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler);
 static void _e_fm_op_set_up_idlers();
 static void _e_fm_op_delete_idler(int *mark);
 static int _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm_Op_Task *task);
 
-static int _e_fm_op_work_idler(void *data);
-static int _e_fm_op_scan_idler(void *data);
+static Eina_Bool _e_fm_op_work_idler(void *data);
+static Eina_Bool _e_fm_op_scan_idler(void *data);
 
 static void _e_fm_op_send_error(E_Fm_Op_Task * task, E_Fm_Op_Type type, const char *fmt, ...);
 static void _e_fm_op_rollback(E_Fm_Op_Task * task);
@@ -413,7 +413,7 @@ _e_fm_op_remove_link_task(E_Fm_Op_Task *task)
  * variable _e_fm_op_stdin_buffer to deal with a situation, when read() 
  * did not actually read enough data.
  */
-static int
+static Eina_Bool
 _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
 {
    int fd;
@@ -509,7 +509,7 @@ _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
         buf = _e_fm_op_stdin_buffer + length;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void 
@@ -640,7 +640,7 @@ _e_fm_op_idler_handle_error(int *mark, Eina_List **queue, Eina_List **node, E_Fm
  * If we have an abort (_e_fm_op_abort = 1), then _atom() should recognize it and do smth. 
  * After this, just finish everything.
  */
-static int
+static Eina_Bool
 _e_fm_op_work_idler(void *data)
 {
    /* E_Fm_Op_Task is marked static here because _e_fm_op_work_queue can be populated with another
@@ -673,18 +673,18 @@ _e_fm_op_work_idler(void *data)
              /* You may want to look at the comment in _e_fm_op_scan_atom() about this separator thing. */
              _e_fm_op_work_queue = eina_list_remove_list(_e_fm_op_work_queue, _e_fm_op_separator);
              node = NULL;
-             return 1;
+             return ECORE_CALLBACK_RENEW;
           }
 
         if ((_e_fm_op_scan_idler_p == NULL) && (!_e_fm_op_work_error) && 
             (!_e_fm_op_scan_error))
           ecore_main_loop_quit();
 
-        return 1;
+        return ECORE_CALLBACK_RENEW;
      }
 
    if (_e_fm_op_idler_handle_error(&_e_fm_op_work_error, &_e_fm_op_work_queue, &node, task)) 
-     return 1;
+     return ECORE_CALLBACK_RENEW;
 
    task->started = 1;
 
@@ -708,17 +708,17 @@ _e_fm_op_work_idler(void *data)
      {
 	/* So, _atom did what it whats in case of abort. Now to idler. */
 	ecore_main_loop_quit();
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /* This works pretty much the same as _e_fm_op_work_idler(), except that 
  * if this is a dir, then look into its contents and create a task 
  * for those files. And we don't have _e_fm_op_separator here.
  */
-int
+Eina_Bool
 _e_fm_op_scan_idler(void *data)
 {
    static Eina_List *node = NULL;
@@ -739,17 +739,17 @@ _e_fm_op_scan_idler(void *data)
    if (!task)
      {
 	_e_fm_op_scan_idler_p = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    if (_e_fm_op_idler_handle_error(&_e_fm_op_scan_error, &_e_fm_op_scan_queue, &node, task)) 
-     return 1;
+     return ECORE_CALLBACK_RENEW;
 
    if (_e_fm_op_abort)
      {
 	/* We're marked for abortion. */
 	ecore_main_loop_quit();
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    if (task->type == E_FM_OP_COPY_STAT_INFO)
@@ -809,11 +809,11 @@ _e_fm_op_scan_idler(void *data)
              closedir(dir);
              dir = NULL;
              node = NULL;
-             return 1;
+             return ECORE_CALLBACK_RENEW;
           }
 
         if ((!strcmp(de->d_name, ".") || (!strcmp(de->d_name, ".."))))
-          return 1;
+          return ECORE_CALLBACK_RENEW;
 
         ntask = _e_fm_op_task_new();
         ntask->type = task->type;
@@ -845,7 +845,7 @@ _e_fm_op_scan_idler(void *data)
           }
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /* Packs and sends an error to STDOUT.
diff --git a/src/bin/e_focus.c b/src/bin/e_focus.c
index 62156cf2e..f0eefd885 100644
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@@ -4,7 +4,7 @@
 #include "e.h"
 
 /* local subsystem functions */
-static int _e_focus_raise_timer(void* data);
+static Eina_Bool _e_focus_raise_timer(void* data);
 
 /* local subsystem globals */
 
@@ -205,14 +205,13 @@ e_focus_setdown(E_Border *bd)
 
 
 /* local subsystem functions */
-     
-static int
+static Eina_Bool
 _e_focus_raise_timer(void* data)
 {
    E_Border *bd;
-   
+
    bd = data;
    if (!bd->lock_user_stacking) e_border_raise(bd);
    bd->raise_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index b4253e768..252dda668 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -11,8 +11,8 @@ static void _e_gadcon_free(E_Gadcon *gc);
 static void _e_gadcon_client_free(E_Gadcon_Client *gcc);
 
 static void _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc);
-static int _e_gadcon_cb_client_scroll_timer(void *data);
-static int _e_gadcon_cb_client_scroll_animator(void *data);
+static Eina_Bool _e_gadcon_cb_client_scroll_timer(void *data);
+static Eina_Bool _e_gadcon_cb_client_scroll_animator(void *data);
 static void _e_gadcon_cb_client_frame_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_cb_client_frame_moveresize(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_gadcon_client_save(E_Gadcon_Client *gcc);
@@ -79,8 +79,8 @@ static void e_gadcon_layout_pack_aspect_pad_set(Evas_Object *obj, int w, int h);
 static void e_gadcon_layout_unpack(Evas_Object *obj);
 static void _e_gadcon_provider_populate_request(const E_Gadcon_Client_Class *cc);
 static void _e_gadcon_provider_populate_unrequest(const E_Gadcon_Client_Class *cc);
-static int  _e_gadcon_provider_populate_idler(void *data);
-static int  _e_gadcon_custom_populate_idler(void *data);
+static Eina_Bool  _e_gadcon_provider_populate_idler(void *data);
+static Eina_Bool  _e_gadcon_custom_populate_idler(void *data);
 
 static int _e_gadcon_location_change(E_Gadcon_Client * gcc, E_Gadcon_Location *src, E_Gadcon_Location *dst);
 /********************/
@@ -1618,7 +1618,7 @@ _e_gadcon_moveresize_handle(E_Gadcon_Client *gcc)
 			    );
 }
 
-static int
+static Eina_Bool
 _e_gadcon_cb_client_scroll_timer(void *data)
 {
    E_Gadcon_Client *gcc;
@@ -1631,14 +1631,14 @@ _e_gadcon_cb_client_scroll_timer(void *data)
      {
 	gcc->scroll_pos =  gcc->scroll_wanted;
 	gcc->scroll_timer = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    v = 0.05;
    gcc->scroll_pos = (gcc->scroll_pos * (1.0 - v)) + (gcc->scroll_wanted * v);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_gadcon_cb_client_scroll_animator(void *data)
 {
    E_Gadcon_Client *gcc;
@@ -1651,13 +1651,13 @@ _e_gadcon_cb_client_scroll_animator(void *data)
    if (!gcc->scroll_timer)
      {
 	gcc->scroll_animator = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    if (gcc->scroll_cb.func)
      gcc->scroll_cb.func(gcc->scroll_cb.data);
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -2512,7 +2512,7 @@ _e_gadcon_client_cb_menu_post(void *data, E_Menu *m)
    gcc->menu = NULL;
 }
 
-static int
+static Eina_Bool
 _e_gadcon_client_cb_instant_edit_timer(void *data)
 {
    E_Gadcon_Client *gcc;
@@ -2521,7 +2521,7 @@ _e_gadcon_client_cb_instant_edit_timer(void *data)
    e_gadcon_client_edit_begin(gcc);
    _e_gadcon_client_move_start(gcc);
    gcc->instant_edit_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -4932,7 +4932,7 @@ _e_gadcon_layout_smart_restore_gadcons_position_before_move(E_Smart_Data *sd, E_
      }
 }
 
-static int
+static Eina_Bool
 _e_gadcon_custom_populate_idler(void *data)
 {
    const E_Gadcon_Client_Class *cc;
@@ -4953,10 +4953,10 @@ _e_gadcon_custom_populate_idler(void *data)
      }
 
    custom_populate_idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_gadcon_provider_populate_idler(void *data __UNUSED__)
 {
    const E_Gadcon_Client_Class *cc;
@@ -4981,7 +4981,7 @@ _e_gadcon_provider_populate_idler(void *data __UNUSED__)
      e_gadcon_layout_thaw(gc->o_container);
 
    populate_idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_ilist.c b/src/bin/e_ilist.c
index b9933b437..e8ff3b293 100644
--- a/src/bin/e_ilist.c
+++ b/src/bin/e_ilist.c
@@ -44,7 +44,7 @@ static void _e_smart_event_key_down   (void *data, Evas *evas, Evas_Object *obj,
 
 static void _e_typebuf_add          (Evas_Object *obj, const char *s);
 static void _e_typebuf_match        (Evas_Object *obj);
-static int  _e_typebuf_timer_cb     (void *data);
+static Eina_Bool _e_typebuf_timer_cb(void *data);
 static void _e_typebuf_timer_update (Evas_Object *obj);
 static void _e_typebuf_timer_delete (Evas_Object *obj);
 static void _e_typebuf_clean        (Evas_Object *obj);
@@ -1354,13 +1354,13 @@ _e_typebuf_match(Evas_Object *obj)
    free(match);
 }
 
-static int
+static Eina_Bool
 _e_typebuf_timer_cb(void *data)
 {
    Evas_Object *obj = data;
 
    _e_typebuf_clean(obj);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index 291871f06..e56d0fe4e 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -6,7 +6,7 @@
 EAPI int E_EVENT_INIT_DONE = 0;
 
 /* local function prototypes */
-static int _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event);
 
 /* local variables */
 static const char *title = NULL;
@@ -210,7 +210,7 @@ e_init_count_get(void)
 }
 
 /* local functions */
-static int
+static Eina_Bool
 _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
@@ -222,5 +222,5 @@ _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event
 //	ecore_exe_free(init_exe);
 	init_exe = NULL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
diff --git a/src/bin/e_init_main.c b/src/bin/e_init_main.c
index a8bdcc05e..dd4e387bd 100644
--- a/src/bin/e_init_main.c
+++ b/src/bin/e_init_main.c
@@ -29,9 +29,9 @@ EAPI void e_init_done(void);
 
 /* local subsystem functions */
 static int _e_ipc_init(void);
-static int _e_ipc_cb_server_add(void *data, int type, void *event);
-static int _e_ipc_cb_server_del(void *data, int type, void *event);
-static int _e_ipc_cb_server_data(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
 
 /* local subsystem globals */
 static Ecore_Ipc_Server *_e_ipc_server = NULL;
@@ -45,11 +45,11 @@ static Ecore_X_Window *initwins = NULL;
 static int initwins_num = 0;
 static Ecore_Ipc_Server *server = NULL;
 
-static int
+static Eina_Bool
 delayed_ok(void *data)
 {
    kill(getppid(), SIGUSR2);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 int
@@ -145,8 +145,8 @@ _e_ipc_init(void)
    return 1;
 }
 
-static int
-_e_ipc_cb_server_add(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Ipc_Event_Server_Add *e;
 
@@ -158,24 +158,24 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
 			 0, 0, 0,
 			 initwins, initwins_num * sizeof(Ecore_X_Window));
    ecore_ipc_server_flush(server);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_ipc_cb_server_del(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    /* quit now */
    ecore_main_loop_quit();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_ipc_cb_server_data(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_data(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Ipc_Event_Server_Data *e;
 
    e = event;
-   if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return 1;
+   if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON;
    switch (e->minor)
      {
       case 1:
@@ -188,14 +188,14 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
       default:
 	break;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_init_cb_signal_enable(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, const char *source);
-static int _e_init_cb_window_configure(void *data, int ev_type, void *ev);
-static int _e_init_cb_timeout(void *data);
+static Eina_Bool _e_init_cb_window_configure(void *data, int ev_type, void *ev);
+static Eina_Bool _e_init_cb_timeout(void *data);
 static Ecore_Evas *_e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret);
 
 /* local subsystem globals */
@@ -399,27 +399,27 @@ _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, co
    ecore_main_loop_quit();
 }
 
-static int
-_e_init_cb_window_configure(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_init_cb_window_configure(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    Ecore_X_Event_Window_Configure *e;
 
    e = ev;
    /* really simple - don't handle xinerama - because this event will only
     * happen in single head */
-   if (e->win != _e_init_root_win) return 1;
+   if (e->win != _e_init_root_win) return ECORE_CALLBACK_PASS_ON;
    ecore_evas_resize(_e_init_ecore_evas, e->w, e->h);
    evas_object_resize(_e_init_object, e->w, e->h);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_init_cb_timeout(void *data)
 {
    e_init_hide();
    _e_init_timeout_timer = NULL;
    ecore_main_loop_quit();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static Ecore_Evas *
diff --git a/src/bin/e_int_border_remember.c b/src/bin/e_int_border_remember.c
index bd93055c3..7d9ebb0d9 100644
--- a/src/bin/e_int_border_remember.c
+++ b/src/bin/e_int_border_remember.c
@@ -156,7 +156,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 	       }
 	     for (j = 0; bd->client.icccm.command.argv[i][j]; j++)
 	       {
-		  if (k >= (sizeof(buf) - 10))
+		  if (k >= (int) (sizeof(buf) - 10))
 		    {
 		       buf[k] = 0;
 		       goto done;
@@ -357,7 +357,7 @@ _check_matches(E_Remember *rem, int update)
 	  match &= ~E_REMEMBER_MATCH_ROLE;
 
 	if ((match & E_REMEMBER_MATCH_TYPE) &&
-	    (rem->type == bd->client.netwm.type))
+	    (rem->type == (int) bd->client.netwm.type))
 	  match &= ~E_REMEMBER_MATCH_TYPE;
 
 	if ((match & E_REMEMBER_MATCH_TRANSIENT) &&
diff --git a/src/bin/e_int_config_modules.c b/src/bin/e_int_config_modules.c
index e79a872fd..c079dc84a 100644
--- a/src/bin/e_int_config_modules.c
+++ b/src/bin/e_int_config_modules.c
@@ -390,7 +390,7 @@ _types_list_sort(const void *data1, const void *data2)
    return strcmp(t1->name, t2->name);
 }
 
-static int
+static Eina_Bool
 _fill_data_loader_iterate(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
@@ -420,20 +420,20 @@ _fill_data_loader_iterate(void *data)
      {
 	_widget_list_populate(cfdata);
 	cfdata->data_loader = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _fill_data_delayed(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
 
    cfdata->data_loader = ecore_idler_add(_fill_data_loader_iterate, cfdata);
    cfdata->data_delay = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static Eina_Bool
@@ -560,7 +560,7 @@ _widget_list_populate(E_Config_Dialog_Data *cfdata)
    evas_event_thaw(cfdata->evas);
 }
 
-static int
+static Eina_Bool
 _widget_list_item_selected_postponed(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
@@ -607,7 +607,7 @@ _widget_list_item_selected_postponed(void *data)
    e_widget_textblock_markup_set(cfdata->o_desc, description);
 
    cfdata->selected.idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_int_gadcon_config.c b/src/bin/e_int_gadcon_config.c
index b1eb8a2ce..8f62b3445 100644
--- a/src/bin/e_int_gadcon_config.c
+++ b/src/bin/e_int_gadcon_config.c
@@ -24,13 +24,13 @@ static void _fill_data(E_Config_Dialog_Data *cfdata);
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Eina_Bool _free_gadgets(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *data, void *fdata __UNUSED__);
 static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static int _cb_load_timer(void *data);
+static Eina_Bool _cb_load_timer(void *data);
 static void _fill_list(E_Config_Dialog_Data *cfdata);
 static void _cb_list_selected(void *data);
 static void _cb_add(void *data, void *data2 __UNUSED__);
 static void _cb_del(void *data, void *data2 __UNUSED__);
 static CFGadget *_search_hash(E_Config_Dialog_Data *cfdata, const char *name);
-static int _cb_mod_update(void *data, int type, void *event __UNUSED__);
+static Eina_Bool _cb_mod_update(void *data, int type, void *event __UNUSED__);
 
 EAPI void 
 e_int_gadcon_config_shelf(E_Gadcon *gc) 
@@ -174,15 +174,15 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    return ot;
 }
 
-static int 
-_cb_load_timer(void *data) 
+static Eina_Bool
+_cb_load_timer(void *data)
 {
    E_Config_Dialog_Data *cfdata;
 
-   if (!(cfdata = data)) return 1;
+   if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
    _fill_list(cfdata);
    cfdata->load_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
@@ -382,13 +382,13 @@ _search_hash(E_Config_Dialog_Data *cfdata, const char *name)
    return ret;
 }
 
-static int 
-_cb_mod_update(void *data, int type, void *event __UNUSED__) 
+static Eina_Bool
+_cb_mod_update(void *data, int type, void *event __UNUSED__)
 {
    E_Config_Dialog_Data *cfdata;
 
-   if (type != E_EVENT_MODULE_UPDATE) return 1;
-   if (!(cfdata = data)) return 1;
+   if (type != E_EVENT_MODULE_UPDATE) return ECORE_CALLBACK_PASS_ON;
+   if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
    _fill_list(cfdata);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 675c53493..ff45b3fdf 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1189,7 +1189,7 @@ _e_int_menus_clients_title_abbrv(const char *title)
    int max_len;
 
    max_len = e_config->clientlist_max_caption_len;
-   if ((e_config->clientlist_limit_caption_len) && (strlen(title) > max_len))
+   if ((e_config->clientlist_limit_caption_len) && ((int) strlen(title) > max_len))
      {
 	char *abbv;
 	const char *left, *right;
@@ -1422,7 +1422,7 @@ _e_int_menus_shelves_pre_cb(void *data, E_Menu *m)
 
 	if (!s) continue;
 	if (s->zone->num != zone->num) continue;
-	if (s->cfg->container != con->num) continue;
+	if (s->cfg->container != (int) con->num) continue;
 
 	name = s->name;
 	if (!name) name = _("Shelf #");	
diff --git a/src/bin/e_int_shelf_config.c b/src/bin/e_int_shelf_config.c
index 19d77e6c4..7e7c76001 100644
--- a/src/bin/e_int_shelf_config.c
+++ b/src/bin/e_int_shelf_config.c
@@ -472,7 +472,8 @@ static void
 _fill_desks(E_Config_Dialog_Data *cfdata) 
 {
    Evas *evas;
-   int mw, x, y, i;
+   int mw, x, y;
+   int i = 0;
 
    evas = evas_object_evas_get(cfdata->o_desk_list);
    evas_event_freeze(evas);
diff --git a/src/bin/e_intl.c b/src/bin/e_intl.c
index 27e4046ab..df43bd772 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@@ -50,7 +50,7 @@ static void 		 _e_intl_locale_hash_free(Eina_Hash *language_hash);
 static Eina_Bool 	 _e_intl_locale_hash_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
 /* Input Method Configuration and Management */
-static int 		 _e_intl_cb_exit(void *data, int type, void *event);
+static Eina_Bool	 _e_intl_cb_exit(void *data, int type, void *event);
 static Eina_List 	*_e_intl_imc_dir_scan(const char *dir);
 
 EAPI int
@@ -416,19 +416,19 @@ e_intl_imc_system_path_get(void)
    return _e_intl_imc_system_path;
 }
 
-static int
-_e_intl_cb_exit(void *data, int type, void *event)
+static Eina_Bool
+_e_intl_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
 
    ev = event;
-   if (!ev->exe) return 1;
+   if (!ev->exe) return ECORE_CALLBACK_PASS_ON;
 
    if (!(ecore_exe_tag_get(ev->exe) &&
 	 (!strcmp(ecore_exe_tag_get(ev->exe), "E/im_exec")))) return 1;
 
    _e_intl_input_method_exec = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -547,7 +547,7 @@ _e_intl_locale_alias_get(const char *language)
    Eina_Hash *alias_hash;
    char *alias;
    char *lower_language;
-   int i;
+   unsigned int i;
 
    if ((language == NULL) || (!strncmp(language, "POSIX", strlen("POSIX"))))
      return strdup("C");
@@ -639,7 +639,7 @@ e_intl_locale_parts_get(const char *locale)
 
    /* Parse State */
    int   state = 0; /* start out looking for the language */
-   int   locale_idx;
+   unsigned int locale_idx;
    int   tmp_idx = 0;
 
    /* Parse Loop - Seperators are _ . @ */
diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index b836275d2..a0638c37b 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -1,10 +1,10 @@
 #include "e.h"
 
-#ifdef USE_IPC  
+#ifdef USE_IPC
 /* local subsystem functions */
-static int _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event);
 
 /* local subsystem globals */
 static Ecore_Ipc_Server *_e_ipc_server = NULL;
@@ -14,11 +14,11 @@ static Ecore_Ipc_Server *_e_ipc_server = NULL;
 EAPI int
 e_ipc_init(void)
 {
-#ifdef USE_IPC  
+#ifdef USE_IPC
    char buf[1024];
    char *tmp, *user, *disp;
    int pid;
-   
+
    tmp = getenv("TMPDIR");
    if (!tmp) tmp = "/tmp";
    user = getenv("USER");
@@ -33,12 +33,12 @@ e_ipc_init(void)
    else
      {
 	struct stat st;
-	
+
 	if (stat(buf, &st) == 0)
 	  {
-	     if ((st.st_uid == 
+	     if ((st.st_uid ==
 		  getuid()) &&
-		 ((st.st_mode & (S_IFDIR|S_IRWXU|S_IRWXG|S_IRWXO)) == 
+		 ((st.st_mode & (S_IFDIR|S_IRWXU|S_IRWXG|S_IRWXO)) ==
 		  (S_IRWXU|S_IFDIR)))
 	       {
 	       }
@@ -71,16 +71,16 @@ e_ipc_init(void)
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_ADD, _e_ipc_cb_client_add, NULL);
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DEL, _e_ipc_cb_client_del, NULL);
    ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, _e_ipc_cb_client_data, NULL);
-   
+
    e_ipc_codec_init();
-#endif   
+#endif
    return 1;
 }
 
 EAPI int
 e_ipc_shutdown(void)
 {
-#ifdef USE_IPC  
+#ifdef USE_IPC
    e_ipc_codec_shutdown();
    if (_e_ipc_server)
      {
@@ -91,40 +91,40 @@ e_ipc_shutdown(void)
    return 1;
 }
 
-#ifdef USE_IPC  
+#ifdef USE_IPC
 /* local subsystem globals */
-static int
+static Eina_Bool
 _e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Add *e;
-   
+
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
-   return 1;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Del *e;
-   
+
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
    /* delete client sruct */
    e_thumb_client_del(e);
    e_fm2_client_del(e);
    e_init_client_del(e);
    ecore_ipc_client_del(e->client);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Data *e;
-   
+
    e = event;
-   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return 1;
+   if (ecore_ipc_client_server_get(e->client) != _e_ipc_server) return ECORE_CALLBACK_PASS_ON;
    switch (e->major)
      {
       case E_IPC_DOMAIN_SETUP:
@@ -136,21 +136,21 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
           case E_IPC_OP_EXEC_ACTION:
                {
                   E_Ipc_2Str *req = NULL;
-                  
+
                   if (e_ipc_codec_2str_dec(e->data, e->size, &req))
                     {
                        Eina_List *m = e_manager_list();
                        int len, ok = 0;
                        void *d;
-                       
+
                        if (m)
                          {
                             E_Manager *man = eina_list_data_get(m);
-                            
+
                             if (man)
                               {
                                  E_Action *act = e_action_find(req->str1);
-                                 
+
                                  if (act && act->func.go)
                                    {
                                       act->func.go(E_OBJECT(man), req->str2);
@@ -158,17 +158,17 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
                                    }
                               }
                          }
-                       
+
                        d = e_ipc_codec_int_enc(ok, &len);
                        if (d)
                          {
-                            ecore_ipc_client_send(e->client, 
-                                                  E_IPC_DOMAIN_REPLY, 
-                                                  E_IPC_OP_EXEC_ACTION_REPLY, 
+                            ecore_ipc_client_send(e->client,
+                                                  E_IPC_DOMAIN_REPLY,
+                                                  E_IPC_OP_EXEC_ACTION_REPLY,
                                                   0, 0, 0, d, len);
                             free(d);
                          }
-                       
+
                        if (req)
                          {
                             E_FREE(req->str1);
@@ -195,5 +195,5 @@ _e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 	break;
      }
    return 1;
-}  
+}
 #endif
diff --git a/src/bin/e_layout.c b/src/bin/e_layout.c
index e19ebfbf2..f596704b4 100644
--- a/src/bin/e_layout.c
+++ b/src/bin/e_layout.c
@@ -305,7 +305,7 @@ _e_layout_smart_disown(Evas_Object *obj)
 }
 
 static void
-_e_layout_smart_item_del_hook(void *data, Evas *e, Evas_Object *obj, void *event_info)
+_e_layout_smart_item_del_hook(__UNUSED__ void *data, __UNUSED__ Evas *e, Evas_Object *obj, __UNUSED__ void *event_info)
 {
    e_layout_unpack(obj);
 }
@@ -359,6 +359,9 @@ _e_layout_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_livethumb.c b/src/bin/e_livethumb.c
index ab21bd159..3f260c355 100644
--- a/src/bin/e_livethumb.c
+++ b/src/bin/e_livethumb.c
@@ -213,6 +213,9 @@ _e_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 341640120..9d831402f 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -76,14 +76,14 @@ static int  _e_main_path_init(void);
 static int  _e_main_path_shutdown(void);
 
 static void _e_main_cb_x_fatal(void *data __UNUSED__);
-static int _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
-static int _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
-static int _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
-static int _e_main_cb_x_flusher(void *data __UNUSED__);
-static int _e_main_cb_idler_before(void *data __UNUSED__);
-static int _e_main_cb_idler_after(void *data __UNUSED__);
-static int _e_main_cb_eet_cacheburst_end(void *data __UNUSED__);
-static int _e_main_cb_startup_fake_end(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
+static Eina_Bool _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__);
+static Eina_Bool _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
+static Eina_Bool _e_main_cb_x_flusher(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_idler_before(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_idler_after(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_eet_cacheburst_end(void *data __UNUSED__);
+static Eina_Bool _e_main_cb_startup_fake_end(void *data __UNUSED__);
 static void _e_main_desk_save(void);
 static void _e_main_desk_restore(E_Manager *man, E_Container *con);
 static void _e_main_test_svg_loader(void);
@@ -115,13 +115,17 @@ static double t0, t1, t2;
 #define TS(x)
 #endif
 
-static int 
+#undef DBG_EINA_STRINGSHARE
+
+#ifdef DBG_EINA_STRINGSHARE
+static Eina_Bool
 stdbg(void *data __UNUSED__)
 {
-// enable to debug eina stringshare usage   
-//   eina_stringshare_dump();
-   return 0;
+// enable to debug eina stringshare usage
+   eina_stringshare_dump();
+   return ECORE_CALLBACK_CANCEL;
 }
+#endif
 
 /* externally accessible functions */
 int
@@ -1103,8 +1107,10 @@ main(int argc, char **argv)
    starting = 0;
    /* start our main loop */
 
+#ifdef DBG_EINA_STRINGSHARE
    // enable to debug eina stringshare usage
-//   ecore_timer_add(5.0, stdbg, NULL);
+   ecore_timer_add(5.0, stdbg, NULL);
+#endif
 
    ecore_main_loop_begin();
 
@@ -1516,22 +1522,22 @@ _e_main_cb_x_fatal(void *data __UNUSED__)
 //   ecore_main_loop_quit();
 }
 
-static int
+static Eina_Bool
 _e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
    e_sys_action_do(E_SYS_EXIT, NULL);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    e_sys_action_do(E_SYS_RESTART, NULL);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_Event_Signal_User *e = ev;
@@ -1545,18 +1551,18 @@ _e_main_cb_signal_user(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
      {
         // FIXME: another core util for doing things with e
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_x_flusher(void *data __UNUSED__)
 {
    eet_clearcache();
    ecore_x_flush();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_idler_before(void *data __UNUSED__)
 {
    Eina_List *l, *pl;
@@ -1587,10 +1593,10 @@ _e_main_cb_idler_before(void *data __UNUSED__)
    _e_cacheburst--;
 /* eet_cacheburst(_e_cacheburst); */
    edje_thaw();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_idler_after(void *data __UNUSED__)
 {
    edje_freeze();
@@ -1606,22 +1612,22 @@ _e_main_cb_idler_after(void *data __UNUSED__)
 	     e_precache_end = 1;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_eet_cacheburst_end(void *data __UNUSED__)
 {
    _e_cacheburst--;
 /* eet_cacheburst(_e_cacheburst); */
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_main_cb_startup_fake_end(void *data __UNUSED__)
 {
    e_init_hide();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index 5f96cee4d..6f463d82a 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -6,14 +6,14 @@
 /* local subsystem functions */
 static void _e_manager_free(E_Manager *man);
 
-static int _e_manager_cb_window_show_request(void *data, int ev_type, void *ev);
-static int _e_manager_cb_window_configure(void *data, int ev_type, void *ev);
-static int _e_manager_cb_key_up(void *data, int ev_type, void *ev);
-static int _e_manager_cb_key_down(void *data, int ev_type, void *ev);
-static int _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev);
-static int _e_manager_cb_ping(void *data, int ev_type, void *ev);
-static int _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
-static int _e_manager_cb_client_message(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_window_show_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_window_configure(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_key_up(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_key_down(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_frame_extents_request(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_ping(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_screensaver_notify(void *data, int ev_type, void *ev);
+static Eina_Bool _e_manager_cb_client_message(void *data, int ev_type, void *ev);
 
 static Eina_Bool _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__,
 						  const void *key __UNUSED__,
@@ -540,22 +540,22 @@ _e_manager_free(E_Manager *man)
    free(man);
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_window_show_request(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
    Ecore_X_Event_Window_Show_Request *e;
-   
+
    man = data;
    e = ev;
    if (e_stolen_win_get(e->win)) return 1;
    if (ecore_x_window_parent_get(e->win) != man->root)
-     return 1;  /* try other handlers for this */
-   
+     return ECORE_CALLBACK_PASS_ON;  /* try other handlers for this */
+
      {
 	E_Container *con;
 	E_Border *bd;
-	
+
 	con = e_container_current_get(man);
 	if (!e_border_find_by_client_window(e->win))
 	  {
@@ -564,10 +564,10 @@ _e_manager_cb_window_show_request(void *data, int ev_type __UNUSED__, void *ev)
 	       ecore_x_window_show(e->win);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_window_configure(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
@@ -575,12 +575,12 @@ _e_manager_cb_window_configure(void *data, int ev_type __UNUSED__, void *ev)
    
    man = data;
    e = ev;
-   if (e->win != man->root) return 1;
+   if (e->win != man->root) return ECORE_CALLBACK_PASS_ON;
    e_manager_resize(man, e->w, e->h);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_key_down(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
@@ -589,14 +589,14 @@ _e_manager_cb_key_down(void *data, int ev_type __UNUSED__, void *ev)
    man = data;
    e = ev;
 
-   if (e->event_window != man->root) return 1;
+   if (e->event_window != man->root) return ECORE_CALLBACK_PASS_ON;
    if (e->root_window != man->root) man = _e_manager_get_for_root(e->root_window);
    if (e_bindings_key_down_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
-     return 0;
-   return 1;
+     return ECORE_CALLBACK_DONE;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_key_up(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
@@ -605,14 +605,14 @@ _e_manager_cb_key_up(void *data, int ev_type __UNUSED__, void *ev)
    man = data;
    e = ev;
 
-   if (e->event_window != man->root) return 1;
+   if (e->event_window != man->root) return ECORE_CALLBACK_PASS_ON;
    if (e->root_window != man->root) man = _e_manager_get_for_root(e->root_window);
    if (e_bindings_key_up_event_handle(E_BINDING_CONTEXT_MANAGER, E_OBJECT(man), ev))
-     return 0;
-   return 1;
+     return ECORE_CALLBACK_DONE;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
@@ -630,7 +630,7 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
    con = e_container_current_get(man);
    e = ev;
 
-   if (ecore_x_window_parent_get(e->win) != man->root) return 1;
+   if (ecore_x_window_parent_get(e->win) != man->root) return ECORE_CALLBACK_PASS_ON;
 
    /* TODO:
     * * We need to check if we remember this window, and border locking is set
@@ -745,10 +745,10 @@ _e_manager_cb_frame_extents_request(void *data, int ev_type __UNUSED__, void *ev
    if (extents)
      ecore_x_netwm_frame_size_set(e->win, extents->l, extents->r, extents->t, extents->b);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_ping(void *data, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
@@ -758,24 +758,24 @@ _e_manager_cb_ping(void *data, int ev_type __UNUSED__, void *ev)
    man = data;
    e = ev;
 
-   if (e->win != man->root) return 1;
+   if (e->win != man->root) return ECORE_CALLBACK_PASS_ON;
 
    bd = e_border_find_by_client_window(e->event_win);
-   if (!bd) return 1;
+   if (!bd) return ECORE_CALLBACK_PASS_ON;
 
    bd->ping_ok = 1;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_timer_post_screensaver_lock(void *data __UNUSED__)
 {
    e_desklock_show_autolocked();
    timer_post_screensaver_lock = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    Ecore_X_Event_Screensaver_Notify *e = ev;
@@ -802,11 +802,11 @@ _e_manager_cb_screensaver_notify(void *data __UNUSED__, int ev_type __UNUSED__,
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_manager_cb_client_message(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_manager_cb_client_message(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    Ecore_X_Event_Client_Message *e;
    E_Border *bd;
@@ -859,7 +859,7 @@ _e_manager_cb_client_message(void *data, int ev_type, void *ev)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static Eina_Bool
@@ -867,7 +867,7 @@ _e_manager_frame_extents_free_cb(const Eina_Hash *hash __UNUSED__, const void *k
 				 void *data, void *fdata __UNUSED__)
 {
    free(data);
-   return 1;
+   return EINA_TRUE;
 }
 
 static E_Manager *
diff --git a/src/bin/e_manager.h b/src/bin/e_manager.h
index c78407090..baff0ae71 100644
--- a/src/bin/e_manager.h
+++ b/src/bin/e_manager.h
@@ -9,7 +9,7 @@ typedef struct _E_Manager E_Manager;
 #ifndef E_MANAGER_H
 #define E_MANAGER_H
 
-#define E_MANAGER_TYPE 0xE0b01008
+#define E_MANAGER_TYPE (int) 0xE0b01008
 
 struct _E_Manager
 {
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 6877b69bd..cece8050a 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -76,14 +76,14 @@ static void _e_menu_cb_intercept_container_resize(void *data, Evas_Object *o, Ev
 static void _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee);
 static void _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static int _e_menu_cb_key_down(void *data, int type, void *event);
-static int _e_menu_cb_key_up(void *data, int type, void *event);
-static int _e_menu_cb_mouse_down(void *data, int type, void *event);
-static int _e_menu_cb_mouse_up(void *data, int type, void *event);
-static int _e_menu_cb_mouse_move(void *data, int type, void *event);
-static int _e_menu_cb_mouse_wheel(void *data, int type, void *event);
-static int _e_menu_cb_scroll_animator(void *data);
-static int _e_menu_cb_window_shape(void *data, int ev_type, void *ev);
+static Eina_Bool _e_menu_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_key_up(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _e_menu_cb_scroll_animator(void *data);
+static Eina_Bool _e_menu_cb_window_shape(void *data, int ev_type, void *ev);
 static void _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi);
 static Eina_Bool _e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata);
 
@@ -2553,7 +2553,7 @@ _e_menu_cb_ecore_evas_resize(Ecore_Evas *ee)
 }
 
 static void
-_e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_e_menu_cb_item_in(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
 {
    E_Menu_Item *mi;
    
@@ -2562,7 +2562,7 @@ _e_menu_cb_item_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 }
 
 static void
-_e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_e_menu_cb_item_out(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, void *event_info)
 {
    E_Menu_Item *mi;
    Evas_Event_Mouse_In *ev;
@@ -2585,13 +2585,13 @@ _e_menu_cb_item_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
      }
 }
 
-static int
-_e_menu_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
    if ((!strcmp(ev->key, "Up")) || (!strcmp(ev->key, "KP_Up")))
      _e_menu_item_activate_previous();
    else if ((!strcmp(ev->key, "Down")) || (!strcmp(ev->key, "KP_Down")))
@@ -2635,17 +2635,17 @@ _e_menu_cb_key_down(void *data, int type, void *event)
      _e_menu_item_activate_last();
    else if (ev->compose)
      _e_menu_item_activate_char(ev->compose);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_menu_cb_key_up(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
-   return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /* we need all of these because menus are special and grab the mouse and
@@ -2653,13 +2653,13 @@ _e_menu_cb_key_up(void *data, int type, void *event)
  * events directly to the canvases from our grab window
  */
 
-static int
-_e_menu_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
 
    /* Only allow dragging from floating menus for now.
     * The reason for this is that for non floating menus, 
@@ -2669,25 +2669,25 @@ _e_menu_cb_mouse_down(void *data, int type, void *event)
    if (_e_menu_activate_floating)
      _e_menu_activate_maybe_drag = 1;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_menu_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    Ecore_X_Time t;
    int ret = 0;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
 
    t = ev->timestamp - _e_menu_activate_time;
    if ((_e_menu_activate_time != 0) &&
        (t < (e_config->menus_click_drag_timeout * 1000)))
      {
 	_e_menu_activate_floating = 1;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 
    if (_e_menu_activate_dragging)
@@ -2710,11 +2710,11 @@ _e_menu_cb_mouse_up(void *data, int type, void *event)
      _e_menu_deactivate_all();
    else if (!_e_menu_activate_floating)
      _e_menu_deactivate_all();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_menu_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    Eina_List *l, *tmp;
@@ -2725,7 +2725,7 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
    int is_fast = 0;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
    fast_move_threshold = e_config->menus_fast_mouse_move_threshhold;
    dx = ev->x - _e_menu_x;
    dy = ev->y - _e_menu_y;
@@ -2768,16 +2768,16 @@ _e_menu_cb_mouse_move(void *data, int type, void *event)
    _e_menu_y = ev->y;
    _e_menu_time = ev->timestamp;
    _e_menu_mouse_autoscroll_check();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_menu_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_e_menu_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    
    ev = event;
-   if (ev->window != _e_menu_win) return 1;
+   if (ev->window != _e_menu_win) return ECORE_CALLBACK_PASS_ON;
    if (ev->z < 0) /* up */
      {
 	int i;
@@ -2792,11 +2792,11 @@ _e_menu_cb_mouse_wheel(void *data, int type, void *event)
 	for (i = ev->z; i > 0; i--)
 	  _e_menu_item_activate_next();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_menu_cb_scroll_animator(void *data)
+static Eina_Bool
+_e_menu_cb_scroll_animator(__UNUSED__ void *data)
 {
    double t, dt;
    double dx, dy;
@@ -2845,8 +2845,8 @@ _e_menu_cb_scroll_animator(void *data)
    return 1;
 }
 
-static int
-_e_menu_cb_window_shape(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_menu_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    Eina_List *l;
    Ecore_X_Event_Window_Shape *e;
@@ -2858,7 +2858,7 @@ _e_menu_cb_window_shape(void *data, int ev_type, void *ev)
 	if (m->evas_win == e->win)
 	  m->need_shape_export = 1;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -2875,7 +2875,7 @@ _e_menu_cb_item_submenu_post_default(void *data, E_Menu *m, E_Menu_Item *mi)
 
 
 static Eina_Bool
-_e_menu_categories_free_cb(const Eina_Hash *hash, const void *key, void *data, void *fdata)
+_e_menu_categories_free_cb(__UNUSED__ const Eina_Hash *hash, __UNUSED__ const void *key, void *data, __UNUSED__ void *fdata)
 {
    E_Menu_Category_Callback *cb;
    E_Menu_Category *cat;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 8fd4ffde7..8b27905e8 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -15,7 +15,7 @@ static void _e_module_free(E_Module *m);
 static void _e_module_dialog_disable_show(const char *title, const char *body, E_Module *m);
 static void _e_module_cb_dialog_disable(void *data, E_Dialog *dia);
 static void _e_module_event_update_free(void *data, void *event);
-static int _e_module_cb_idler(void *data);
+static Eina_Bool _e_module_cb_idler(void *data);
 static int _e_module_sort_priority(const void *d1, const void *d2);
 
 /* local subsystem globals */
@@ -531,8 +531,8 @@ _e_module_cb_dialog_disable(void *data, E_Dialog *dia)
    e_config_save_queue();
 }
 
-static int
-_e_module_cb_idler(void *data)
+static Eina_Bool
+_e_module_cb_idler(__UNUSED__ void *data)
 {
    if (_e_modules_delayed)
      {
@@ -550,13 +550,13 @@ _e_module_cb_idler(void *data)
    if (_e_modules_delayed)
      {
 	e_util_wakeup();
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
 
    ecore_event_add(E_EVENT_MODULE_INIT_END, NULL, NULL, NULL);
 
    _e_module_idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int
@@ -571,7 +571,7 @@ _e_module_sort_priority(const void *d1, const void *d2)
 
 
 static void 
-_e_module_event_update_free(void *data, void *event) 
+_e_module_event_update_free(__UNUSED__ void *data, void *event) 
 {
    E_Event_Module_Update *ev;
 
diff --git a/src/bin/e_msg.c b/src/bin/e_msg.c
index e76a5c066..483910071 100644
--- a/src/bin/e_msg.c
+++ b/src/bin/e_msg.c
@@ -21,7 +21,7 @@ struct _E_Msg_Event
 };
 
 /* local subsystem functions */
-static int _e_msg_event_cb(void *data, int ev_type, void *ev);
+static Eina_Bool _e_msg_event_cb(void *data, int ev_type, void *ev);
 static void _e_msg_event_free(void *data, void *ev);
 
 /* local subsystem globals */
@@ -110,8 +110,8 @@ e_msg_handler_del(E_Msg_Handler *emsgh)
 
 /* local subsystem functions */
 
-static int
-_e_msg_event_cb(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_msg_event_cb(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Msg_Event *e;
    Eina_List *l;
@@ -133,7 +133,7 @@ _e_msg_event_cb(void *data, int ev_type, void *ev)
 }
 
 static void
-_e_msg_event_free(void *data, void *ev)
+_e_msg_event_free(__UNUSED__ void *data, void *ev)
 {
    E_Msg_Event *e;
 
diff --git a/src/bin/e_msgbus.c b/src/bin/e_msgbus.c
index 04a8b91e0..4d406aa81 100644
--- a/src/bin/e_msgbus.c
+++ b/src/bin/e_msgbus.c
@@ -135,14 +135,14 @@ _e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err)
 
 /* Core Handlers */
 static DBusMessage* 
-_e_msgbus_core_restart_cb(E_DBus_Object *obj, DBusMessage *msg)
+_e_msgbus_core_restart_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    e_sys_action_do(E_SYS_RESTART, NULL);
    return dbus_message_new_method_return(msg);
 }
 
 static DBusMessage* 
-_e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg)
+_e_msgbus_core_shutdown_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    e_sys_action_do(E_SYS_EXIT, NULL);
    return dbus_message_new_method_return(msg);
@@ -150,7 +150,7 @@ _e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg)
 
 /* Modules Handlers */
 static DBusMessage* 
-_e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg)
+_e_msgbus_module_load_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *module;
@@ -167,8 +167,8 @@ _e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_module_unload_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *module; 
@@ -187,8 +187,8 @@ _e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_module_enable_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *module; 
@@ -205,8 +205,8 @@ _e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_module_disable_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *module; 
@@ -223,8 +223,8 @@ _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_module_list_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    Eina_List *l;
    E_Module *mod;
@@ -255,8 +255,8 @@ _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
 }
 
 /* Profile Handlers */
-static DBusMessage* 
-_e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_profile_set_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *profile; 
@@ -273,8 +273,8 @@ _e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg)
    return dbus_message_new_method_return(msg);
 }
 
-static DBusMessage* 
-_e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_profile_get_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    DBusMessage *reply;
@@ -289,8 +289,8 @@ _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
    return reply;
 }
 
-static DBusMessage* 
-_e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_profile_list_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    Eina_List *l;
    const char *name;
@@ -311,8 +311,8 @@ _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
    return reply;
 }
 
-static DBusMessage* 
-_e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_profile_add_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *profile; 
@@ -326,8 +326,8 @@ _e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg)
 
 }
 
-static DBusMessage* 
-_e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage *msg)
+static DBusMessage*
+_e_msgbus_profile_delete_cb(__UNUSED__ E_DBus_Object *obj, DBusMessage *msg)
 {
    DBusMessageIter iter;
    char *profile; 
diff --git a/src/bin/e_order.c b/src/bin/e_order.c
index 238a55263..093339ad9 100644
--- a/src/bin/e_order.c
+++ b/src/bin/e_order.c
@@ -8,7 +8,7 @@ static void _e_order_free(E_Order *eo);
 static void _e_order_cb_monitor(void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path);
 static void _e_order_read(E_Order *eo);
 static void _e_order_save(E_Order *eo);
-static int _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev);
+static Eina_Bool _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev);
 
 static Eina_List *orders = NULL;
 static Eina_List *handlers = NULL;
@@ -161,7 +161,7 @@ _e_order_free(E_Order *eo)
    free(eo);
 }
 
-static int
+static Eina_Bool
 _e_order_cb_monitor_delay(void *data)
 {
    E_Order *eo = data;
@@ -170,7 +170,7 @@ _e_order_cb_monitor_delay(void *data)
    _e_order_read(eo);
    if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
    eo->delay = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -254,8 +254,8 @@ _e_order_save(E_Order *eo)
    fclose(f);
 }
 
-static int
-_e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_order_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
 {
    Eina_List *l;
    E_Order *eo;
@@ -266,5 +266,5 @@ _e_order_cb_efreet_cache_update(void *data, int ev_type, void *ev)
 	_e_order_read(eo);
 	if (eo->cb.update) eo->cb.update(eo->cb.data, eo);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_pan.c b/src/bin/e_pan.c
index 91ea6cd02..a23261b6d 100644
--- a/src/bin/e_pan.c
+++ b/src/bin/e_pan.c
@@ -273,6 +273,9 @@ _e_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index a70db2785..d4d1e83ff 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -28,13 +28,13 @@ static void _e_pointer_stack_free(E_Pointer_Stack *elem);
 static void  _e_pointer_type_set(E_Pointer *p, const char *type);
 static void _e_pointer_active_handle(E_Pointer *p);
 
-static int _e_pointer_cb_mouse_down(void *data, int type, void *event);
-static int _e_pointer_cb_mouse_up(void *data, int type, void *event);
-static int _e_pointer_cb_mouse_move(void *data, int type, void *event);
-static int _e_pointer_cb_mouse_wheel(void *data, int type, void *event);
-static int _e_pointer_cb_idle_timer_pre(void *data);
-static int _e_pointer_cb_idle_timer_wait(void *data);
-static int _e_pointer_cb_idle_poller(void *data);
+static Eina_Bool _e_pointer_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _e_pointer_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_pointer_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _e_pointer_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _e_pointer_cb_idle_timer_pre(void *data);
+static Eina_Bool _e_pointer_cb_idle_timer_wait(void *data);
+static Eina_Bool _e_pointer_cb_idle_poller(void *data);
 
 /* externally accessible functions */
 EAPI int
@@ -297,7 +297,7 @@ _e_pointer_canvas_del(E_Pointer *p)
 }
 
 static void
-_e_pointer_cb_move(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info)
+_e_pointer_cb_move(void *data, Evas *e __UNUSED__, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
 {
    E_Pointer *p;
    Evas_Coord x, y;
@@ -456,8 +456,8 @@ _e_pointer_active_handle(E_Pointer *p)
    p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p);
 }
 
-static int
-_e_pointer_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_pointer_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -472,11 +472,11 @@ _e_pointer_cb_mouse_down(void *data, int type, void *event)
                                        "e,action,mouse,down", "e");
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_pointer_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_pointer_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -491,11 +491,11 @@ _e_pointer_cb_mouse_up(void *data, int type, void *event)
                                        "e,action,mouse,up", "e");
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_pointer_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_pointer_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -510,11 +510,11 @@ _e_pointer_cb_mouse_move(void *data, int type, void *event)
                                        "e,action,mouse,move", "e");
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_pointer_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_e_pointer_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Eina_List *l;
    E_Pointer *p;
@@ -529,10 +529,10 @@ _e_pointer_cb_mouse_wheel(void *data, int type, void *event)
                                        "e,action,mouse,wheel", "e");
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_pointer_cb_idle_timer_pre(void *data)
 {
    E_Pointer *p;
@@ -543,10 +543,10 @@ _e_pointer_cb_idle_timer_pre(void *data)
    p->x = x;
    p->y = y;
    p->idle_timer = ecore_timer_loop_add(4.0, _e_pointer_cb_idle_timer_wait, p);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_pointer_cb_idle_timer_wait(void *data)
 {
    E_Pointer *p;
@@ -558,16 +558,16 @@ _e_pointer_cb_idle_timer_wait(void *data)
 	if (p->idle_poller) ecore_poller_del(p->idle_poller);
 	p->idle_poller = NULL;
 	p->idle_timer = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    if (!p->idle_poller)
      p->idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 64,
 				       _e_pointer_cb_idle_poller, p);
    p->idle_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_pointer_cb_idle_poller(void *data)
 {
    E_Pointer *p;
@@ -578,7 +578,7 @@ _e_pointer_cb_idle_poller(void *data)
        (!e_config->idle_cursor))
      {
 	p->idle_poller = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    /* check if pointer actually moved since the 1 second post-mouse move idle
     * pre-timer that fetches the position */
@@ -597,7 +597,7 @@ _e_pointer_cb_idle_poller(void *data)
 	     p->idle = 0;
 	  }
 	/* use poller to check from now on */
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
    /* we are idle - report it if not idle before */
    if (!p->idle)
@@ -606,5 +606,5 @@ _e_pointer_cb_idle_poller(void *data)
 	  edje_object_signal_emit(p->pointer_object, "e,state,mouse,idle", "e");
 	p->idle = 1;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index 0746a5fd6..c11317980 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -5,8 +5,8 @@
 
 /* local subsystem functions */
 static void _e_popup_free(E_Popup *pop);
-static int  _e_popup_idle_enterer(void *data);
-static int  _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
+static Eina_Bool _e_popup_idle_enterer(void *data);
+static Eina_Bool _e_popup_cb_window_shape(void *data, int ev_type, void *ev);
 
 /* local subsystem globals */
 static Ecore_Event_Handler *_e_popup_window_shape_handler = NULL;
@@ -239,14 +239,14 @@ e_popup_idler_before(void)
 				 rects[i].width -= rects[i].x;
 				 rects[i].x = 0;
 			      }
-			    if ((rects[i].x + rects[i].width) > pop->w)
+			    if ((rects[i].x + (int) rects[i].width) > pop->w)
 			      rects[i].width = rects[i].width - rects[i].x;
 			    if (rects[i].y < 0)
 			      {
 				 rects[i].height -= rects[i].y;
 				 rects[i].y = 0;
 			      }
-			    if ((rects[i].y + rects[i].height) > pop->h)
+			    if ((rects[i].y + (int) rects[i].height) > pop->h)
 			      rects[i].height = rects[i].height - rects[i].y;
 			    
 			    if ((orects[i].x != rects[i].x) ||
@@ -316,22 +316,22 @@ _e_popup_free(E_Popup *pop)
    free(pop);
 }
 
-static int
+static Eina_Bool
 _e_popup_idle_enterer(void *data)
 {
    E_Popup *pop;
 
-   if (!(pop = data)) return 0;
+   if (!(pop = data)) return ECORE_CALLBACK_CANCEL;
    ecore_evas_move(pop->ecore_evas,
 		   pop->zone->x + pop->x, 
 		   pop->zone->y + pop->y);
    e_container_shape_show(pop->shape);
    pop->idle_enterer = NULL;
-   return 0;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
-_e_popup_cb_window_shape(void *data, int ev_type, void *ev)
+static Eina_Bool
+_e_popup_cb_window_shape(__UNUSED__ void *data, __UNUSED__ int ev_type, void *ev)
 {
    E_Popup *pop;
    Ecore_X_Event_Window_Shape *e;
@@ -339,5 +339,5 @@ _e_popup_cb_window_shape(void *data, int ev_type, void *ev)
    e = ev;
    pop = e_popup_find_by_window(e->win);
    if (pop) pop->need_shape_export = 1;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_powersave.c b/src/bin/e_powersave.c
index 4a77777ac..84b3761e1 100644
--- a/src/bin/e_powersave.c
+++ b/src/bin/e_powersave.c
@@ -11,7 +11,7 @@ struct _E_Powersave_Deferred_Action
 };
 
 /* local subsystem functions */
-static int _e_powersave_cb_deferred_timer(void *data);
+static Eina_Bool _e_powersave_cb_deferred_timer(void *data);
 static void _e_powersave_mode_eval(void);
 static void _e_powersave_event_update_free(void *data __UNUSED__, void *event);
 
@@ -131,7 +131,7 @@ e_powersave_mode_get(void)
 
 /* local subsystem functions */
 
-static int
+static Eina_Bool
 _e_powersave_cb_deferred_timer(void *data)
 {
    E_Powersave_Deferred_Action *pa;
@@ -144,7 +144,7 @@ _e_powersave_cb_deferred_timer(void *data)
      }
    walking_deferred_actions--;
    if (!deferred_actions) deferred_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_remember.c b/src/bin/e_remember.c
index 3bf5d5bfe..e7a56a9b2 100644
--- a/src/bin/e_remember.c
+++ b/src/bin/e_remember.c
@@ -20,7 +20,7 @@ static E_Remember  *_e_remember_find(E_Border *bd, int check_usable);
 static void _e_remember_cb_hook_pre_post_fetch(void *data, void *bd);
 static void _e_remember_cb_hook_eval_post_new_border(void *data, void *bd);
 static void _e_remember_init_edd(void);
-static int _e_remember_restore_cb(void *data, int type, void *event);
+static Eina_Bool _e_remember_restore_cb(void *data, int type, void *event);
 
 /* local subsystem globals */
 static Eina_List *hooks = NULL;
@@ -126,8 +126,8 @@ e_remember_internal_save(void)
    e_config_domain_save("e_remember_restart", e_remember_list_edd, remembers);
 }
 
-static int
-_e_remember_restore_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_remember_restore_cb(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    E_Remember *rem;
    Eina_List *l;
@@ -189,7 +189,7 @@ _e_remember_restore_cb(void *data, int type, void *event)
    if (handlers) eina_list_free(handlers);
    handlers = NULL;
    
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 EAPI E_Remember *
@@ -530,7 +530,7 @@ _e_remember_find(E_Border *bd, int check_usable)
             !e_util_both_str_empty(rem->role, bd->client.icccm.window_role))
           continue;
         if (rem->match & E_REMEMBER_MATCH_TYPE &&
-            rem->type != bd->client.netwm.type)
+            rem->type != (int) bd->client.netwm.type)
           continue;
         if (rem->match & E_REMEMBER_MATCH_TRANSIENT &&
             !(rem->transient && bd->client.icccm.transient_for != 0) &&
@@ -598,7 +598,7 @@ _e_remember_cb_hook_eval_post_new_border(void *data, void *border)
 }
 
 static void
-_e_remember_cb_hook_pre_post_fetch(void *data, void *border)
+_e_remember_cb_hook_pre_post_fetch(__UNUSED__ void *data, void *border)
 {
    E_Border *bd = border;
    E_Remember *rem = NULL;
diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c
index 62c2a304d..6058da2ad 100644
--- a/src/bin/e_screensaver.c
+++ b/src/bin/e_screensaver.c
@@ -11,11 +11,11 @@ static E_Dialog *_e_screensaver_ask_presentation_dia = NULL;
 static int _e_screensaver_ask_presentation_count = 0;
 static int _e_screensaver_fullscreen_count = 0;
 
-static int
+static Eina_Bool
 _e_screensaver_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    e_screensaver_init();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -128,7 +128,7 @@ _e_screensaver_ask_presentation_mode(void)
    _e_screensaver_ask_presentation_dia = dia;
 }
 
-static int
+static Eina_Bool
 _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Screensaver_Notify *e = event;
@@ -149,24 +149,24 @@ _e_screensaver_handler_screensaver_notify_cb(void *data __UNUSED__, int type __U
    else if (_e_screensaver_ask_presentation_count)
      _e_screensaver_ask_presentation_count = 0;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_screensaver_handler_border_fullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_screensaver_fullscreen_count++;
    if (_e_screensaver_fullscreen_count == 1) e_screensaver_init();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_screensaver_handler_border_unfullscreen_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    _e_screensaver_fullscreen_count--;
    if (_e_screensaver_fullscreen_count == 0) e_screensaver_init();
    else if (_e_screensaver_fullscreen_count < 0) _e_screensaver_fullscreen_count = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 EAPI int
diff --git a/src/bin/e_scrollframe.c b/src/bin/e_scrollframe.c
index 9f06ddf72..8b7536318 100644
--- a/src/bin/e_scrollframe.c
+++ b/src/bin/e_scrollframe.c
@@ -71,7 +71,7 @@ static void _e_smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_
 static void _e_smart_pan_pan_changed_hook(void *data, Evas_Object *obj, void *event_info);
 static void _e_smart_event_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int  _e_smart_momentum_animator(void *data);
+static Eina_Bool _e_smart_momentum_animator(void *data);
 static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
@@ -493,7 +493,7 @@ _e_smart_event_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
      }
 }
 
-static int
+static Eina_Bool
 _e_smart_momentum_animator(void *data)
 {
    E_Smart_Data *sd;
@@ -516,10 +516,10 @@ _e_smart_momentum_animator(void *data)
 	if (dt >= 1.0)
 	  {
 	     sd->down.momentum_animator = NULL;
-	     return 0;
+	     return ECORE_CALLBACK_CANCEL;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -1121,7 +1121,7 @@ _e_smart_init(void)
 	       _e_smart_color_set,
 	       _e_smart_clip_set,
 	       _e_smart_clip_unset,
-	       NULL, NULL, NULL, NULL
+	       NULL, NULL, NULL, NULL, NULL, NULL, NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
      }
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index ebc86747e..0a7af154d 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -19,13 +19,13 @@ static void _e_shelf_cb_menu_items_append(void *data, E_Gadcon_Client *gcc, E_Me
 static void _e_shelf_cb_locked_set(void *data, int lock);
 static void _e_shelf_cb_urgent_show(void *data);
 static void _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static int _e_shelf_cb_mouse_in(void *data, int type, void *event);
-static int _e_shelf_cb_mouse_out(void *data, int type, void *event);
+static Eina_Bool _e_shelf_cb_mouse_in(void *data, int type, void *event);
+static Eina_Bool _e_shelf_cb_mouse_out(void *data, int type, void *event);
 static int _e_shelf_cb_id_sort(const void *data1, const void *data2);
-static int _e_shelf_cb_hide_animator(void *data);
-static int _e_shelf_cb_hide_animator_timer(void *data);
-static int _e_shelf_cb_hide_urgent_timer(void *data);
-static int _e_shelf_cb_instant_hide_timer(void *data);
+static Eina_Bool _e_shelf_cb_hide_animator(void *data);
+static Eina_Bool _e_shelf_cb_hide_animator_timer(void *data);
+static Eina_Bool _e_shelf_cb_hide_urgent_timer(void *data);
+static Eina_Bool _e_shelf_cb_instant_hide_timer(void *data);
 static void _e_shelf_menu_pre_cb(void *data, E_Menu *m);
 static void _e_shelf_gadcon_client_remove(void *data, E_Gadcon_Client *gcc);
 static int _e_shelf_gadcon_client_add(void *data, const E_Gadcon_Client_Class *cc);
@@ -1349,13 +1349,13 @@ _e_shelf_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_inf
      }
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_mouse_in(void *data, int type, void *event)
 {
    E_Shelf *es;
 
    es = data;
-   if (es->cfg->autohide_show_action) return 1;
+   if (es->cfg->autohide_show_action) return ECORE_CALLBACK_PASS_ON;
 
    if (type == E_EVENT_ZONE_EDGE_MOVE)
      {
@@ -1363,7 +1363,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
 	int show = 0;
 
 	ev = event;
-	if (es->zone != ev->zone) return 1;
+	if (es->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
 	switch (es->gadcon->orient)
 	  {
 	   case E_GADCON_ORIENT_FLOAT:
@@ -1422,7 +1422,7 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
 	Ecore_X_Event_Mouse_In *ev;
 
 	ev = event;
-	if (!es->popup) return 1;
+	if (!es->popup) return ECORE_CALLBACK_PASS_ON;
 	if (ev->win == es->popup->evas_win)
 	  {
 	     edje_object_signal_emit(es->o_base, "e,state,focused", "e");
@@ -1434,17 +1434,17 @@ _e_shelf_cb_mouse_in(void *data, int type, void *event)
 	Ecore_Event_Mouse_Move *ev;
 
 	ev = event;
-	if (!es->popup) return 1;
+	if (!es->popup) return ECORE_CALLBACK_PASS_ON;
 	if (ev->event_window == es->popup->evas_win)
 	  {
 	     edje_object_signal_emit(es->o_base, "e,state,focused", "e");
 	     e_shelf_toggle(es, 1);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_mouse_out(void *data, int type, void *event)
 {
    E_Shelf *es;
@@ -1460,7 +1460,7 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
 
 	if (es->popup) win = es->popup->evas_win;
 	else win = es->zone->container->event_win;
-	if (ev->win != win) return 1;
+	if (ev->win != win) return ECORE_CALLBACK_PASS_ON;
 
 	/*
 	 * ECORE_X_EVENT_DETAIL_INFERIOR means focus went to children windows
@@ -1471,11 +1471,11 @@ _e_shelf_cb_mouse_out(void *data, int type, void *event)
 	 * not get mouse out itself, so it will stay visible and
 	 * autohide will fail.
 	 */
-	if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return 1;
+	if (ev->detail == ECORE_X_EVENT_DETAIL_INFERIOR) return ECORE_CALLBACK_PASS_ON;
 
 	e_shelf_toggle(es, 0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int
@@ -1490,7 +1490,7 @@ _e_shelf_cb_id_sort(const void *data1, const void *data2)
    return 0;
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_hide_animator(void *data)
 {
    E_Shelf *es;
@@ -1577,7 +1577,7 @@ _e_shelf_cb_hide_animator(void *data)
 	 break;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 
 end:
    es->hide_animator = NULL;
@@ -1587,10 +1587,10 @@ end:
      e_shelf_toggle(es, 0);
    else
      _e_shelf_toggle_border_fix(es);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_hide_animator_timer(void *data)
 {
    E_Shelf *es;
@@ -1599,10 +1599,10 @@ _e_shelf_cb_hide_animator_timer(void *data)
    if (!es->hide_animator)
      es->hide_animator = ecore_animator_add(_e_shelf_cb_hide_animator, es);
    es->hide_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_hide_urgent_timer(void *data)
 {
    E_Shelf *es;
@@ -1610,10 +1610,10 @@ _e_shelf_cb_hide_urgent_timer(void *data)
    es = data;
    es->hide_timer = NULL;
    if (es->urgent_show) e_shelf_toggle(es, 0);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_shelf_cb_instant_hide_timer(void *data)
 {
    E_Shelf *es;
@@ -1658,7 +1658,7 @@ _e_shelf_cb_instant_hide_timer(void *data)
      }
    es->instant_timer = NULL;
    _e_shelf_toggle_border_fix(es);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
diff --git a/src/bin/e_slidecore.c b/src/bin/e_slidecore.c
index 211a5b6c6..dd1d387d6 100644
--- a/src/bin/e_slidecore.c
+++ b/src/bin/e_slidecore.c
@@ -33,7 +33,7 @@ struct _E_Smart_Item
 };
 
 /* local subsystem functions */
-static int _e_smart_cb_slide_animator(void *data);
+static Eina_Bool _e_smart_cb_slide_animator(void *data);
 static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _e_smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
@@ -108,7 +108,7 @@ e_slidecore_slide_time_set(Evas_Object *obj, double t)
 
 /* local subsystem functions */
 
-static int
+static Eina_Bool
 _e_smart_cb_slide_animator(void *data)
 {
    E_Smart_Data *sd;
@@ -126,9 +126,9 @@ _e_smart_cb_slide_animator(void *data)
    if (t >= 1.0)
      {
 	sd->slide_animator = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -409,6 +409,9 @@ _e_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_slider.c b/src/bin/e_slider.c
index cf0d5b104..64534e3f8 100644
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@@ -35,7 +35,7 @@ struct _E_Slider_Special_Value
 };
 
 /* local subsystem functions */
-static int  _e_smart_set_timer(void *data);
+static Eina_Bool _e_smart_set_timer(void *data);
 static void _e_smart_value_update(E_Smart_Data *sd);
 static void _e_smart_value_update_now(E_Smart_Data *sd);
 static void _e_smart_value_fetch(E_Smart_Data *sd);
@@ -245,7 +245,7 @@ e_slider_special_value_add(Evas_Object *obj, double value, double error, const c
 }
 
 /* local subsystem functions */
-static int
+static Eina_Bool
 _e_smart_set_timer(void *data)
 {
    E_Smart_Data *sd = data;
@@ -257,7 +257,7 @@ _e_smart_set_timer(void *data)
    if (sd->reversed) pos = 1.0 - pos;
    edje_object_part_drag_value_set(sd->edje_obj, "e.dragable.slider", pos, pos);
    sd->set_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_spectrum.c b/src/bin/e_spectrum.c
index 3edbd4996..c59e26c84 100644
--- a/src/bin/e_spectrum.c
+++ b/src/bin/e_spectrum.c
@@ -20,7 +20,7 @@ struct _E_Spectrum
   Ecore_Timer *draw_timer;
 };
 
-static int _e_spectrum_redraw(void *d);
+static Eina_Bool _e_spectrum_redraw(void *d);
 
 static void
 _e_spectrum_smart_add(Evas_Object *o)
@@ -170,6 +170,9 @@ _e_spectrum_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
         _e_spectrum_smart = evas_smart_class_new(&sc);
@@ -263,7 +266,7 @@ _e_spectrum_2d_color_at(E_Spectrum *sp, int x, int y, int *r, int *g, int *b)
   if (b) *b = bb;
 }
 
-static int
+static Eina_Bool
 _e_spectrum_redraw(void *d)
 {
   E_Spectrum *sp = d;
@@ -276,7 +279,7 @@ _e_spectrum_redraw(void *d)
   if (!data) 
     {
        sp->draw_timer = NULL;
-       return 0;
+       return ECORE_CALLBACK_CANCEL;
     }
 
   switch (sp->mode)
@@ -321,7 +324,7 @@ _e_spectrum_redraw(void *d)
   evas_object_image_data_set(sp->o_spectrum, data);
   evas_object_image_data_update_add(sp->o_spectrum, 0, 0, sp->iw, sp->ih);
   sp->draw_timer = NULL;
-  return 0;
+  return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 59ed53cf9..6cfe11e08 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -69,7 +69,7 @@ _e_startup(void)
 }
 
 static void
-_e_startup_next_cb(void *data)
+_e_startup_next_cb(__UNUSED__ void *data)
 {
    _e_startup();
 }
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 133eab97f..e81545c76 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -4,12 +4,12 @@
 #include "e.h"
 
 /* local subsystem functions */
-static int _e_sys_cb_timer(void *data);
-static int _e_sys_cb_exit(void *data, int type, void *event);
+static Eina_Bool _e_sys_cb_timer(void *data);
+static Eina_Bool _e_sys_cb_exit(void *data, int type, void *event);
 static void _e_sys_cb_logout_logout(void *data, E_Dialog *dia);
 static void _e_sys_cb_logout_wait(void *data, E_Dialog *dia);
 static void _e_sys_cb_logout_abort(void *data, E_Dialog *dia);
-static int _e_sys_cb_logout_timer(void *data);
+static Eina_Bool _e_sys_cb_logout_timer(void *data);
 static void _e_sys_logout_after(void);
 static void _e_sys_logout_begin(E_Sys_Action a_after);
 static void _e_sys_current_action(void);
@@ -163,8 +163,8 @@ e_sys_con_extra_action_list_get(void)
 }
 
 /* local subsystem functions */
-static int
-_e_sys_cb_timer(void *data)
+static Eina_Bool
+_e_sys_cb_timer(__UNUSED__ void *data)
 {
    /* exec out sys helper and ask it to test if we are allowed to do these
     * things
@@ -180,10 +180,10 @@ _e_sys_cb_timer(void *data)
    _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL);
    snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get());
    _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_sys_cb_exit(void *data, int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
@@ -205,7 +205,7 @@ _e_sys_cb_exit(void *data, int type, void *event)
 	  }
 	_e_sys_action_current = E_SYS_NONE;
 	_e_sys_exe = NULL;
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
    if ((_e_sys_halt_check_exe) && (ev->exe == _e_sys_halt_check_exe))
      {
@@ -245,7 +245,7 @@ _e_sys_cb_exit(void *data, int type, void *event)
 	     _e_sys_hibernate_check_exe = NULL;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -316,7 +316,7 @@ _e_sys_logout_confirm_dialog_update(int remaining)
    e_dialog_text_set(_e_sys_logout_confirm_dialog, txt);
 }
 
-static int
+static Eina_Bool
 _e_sys_cb_logout_timer(void *data)
 {
    Eina_List *l;
@@ -344,12 +344,12 @@ _e_sys_cb_logout_timer(void *data)
 	if (remaining > 0)
 	  {
 	     _e_sys_logout_confirm_dialog_update(remaining);
-	     return 1;
+	     return ECORE_CALLBACK_RENEW;
 	  }
 	else
 	  {
 	     _e_sys_cb_logout_logout(NULL, _e_sys_logout_confirm_dialog);
-	     return 0;
+	     return ECORE_CALLBACK_CANCEL;
 	  }
      }
    else
@@ -377,14 +377,14 @@ _e_sys_cb_logout_timer(void *data)
 		  e_dialog_show(dia);
 		  _e_sys_logout_begin_time = now;
 	       }
-	     return 1;
+	     return ECORE_CALLBACK_RENEW;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
    after:
    _e_sys_logout_after();
    _e_sys_logout_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_table.c b/src/bin/e_table.c
index a017ae9cc..aae1958de 100644
--- a/src/bin/e_table.c
+++ b/src/bin/e_table.c
@@ -822,6 +822,9 @@ _e_table_smart_init(void)
 	       NULL,
 	       NULL,
 	       NULL,
+	       NULL,
+	       NULL,
+	       NULL,
 	       NULL
 	  };
 	_e_smart = evas_smart_class_new(&sc);
diff --git a/src/bin/e_thumb.c b/src/bin/e_thumb.c
index 3f6f16cc4..33a59bca2 100644
--- a/src/bin/e_thumb.c
+++ b/src/bin/e_thumb.c
@@ -26,8 +26,8 @@ static void _e_thumb_hash_del(int objid);
 static Evas_Object *_e_thumb_hash_find(int objid);
 static void _e_thumb_thumbnailers_kill(void);
 static void _e_thumb_thumbnailers_kill_cancel(void);
-static int _e_thumb_cb_kill(void *data);
-static int _e_thumb_cb_exe_event_del(void *data, int type, void *event);
+static Eina_Bool _e_thumb_cb_kill(void *data);
+static Eina_Bool _e_thumb_cb_exe_event_del(void *data, int type, void *event);
 
 /* local subsystem globals */
 static Eina_List *_thumbnailers = NULL;
@@ -137,7 +137,7 @@ e_thumb_icon_begin(Evas_Object *obj)
    if (!eth->file) return;
    if (!_thumbnailers)
      {
-	while (eina_list_count(_thumbnailers_exe) < _num_thumbnailers)
+	while ((int) eina_list_count(_thumbnailers_exe) < _num_thumbnailers)
 	  {
 	     Ecore_Exe *exe;
 
@@ -394,8 +394,8 @@ _e_thumb_thumbnailers_kill_cancel(void)
    _kill_timer = NULL;
 }
 
-static int
-_e_thumb_cb_kill(void *data)
+static Eina_Bool
+_e_thumb_cb_kill(__UNUSED__ void *data)
 {
    Eina_List *l;
    Ecore_Exe *exe;
@@ -403,11 +403,11 @@ _e_thumb_cb_kill(void *data)
    EINA_LIST_FOREACH(_thumbnailers_exe, l, exe)
      ecore_exe_terminate(exe);
    _kill_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_thumb_cb_exe_event_del(void *data, int type, void *event)
+static Eina_Bool
+_e_thumb_cb_exe_event_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    Ecore_Exe *exe;
@@ -422,5 +422,5 @@ _e_thumb_cb_exe_event_del(void *data, int type, void *event)
 	     break;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 3ef4532e8..5995d5e2d 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -47,10 +47,10 @@ struct _E_Thumb
 
 /* local subsystem functions */
 static int _e_ipc_init(void);
-static int _e_ipc_cb_server_add(void *data, int type, void *event);
-static int _e_ipc_cb_server_del(void *data, int type, void *event);
-static int _e_ipc_cb_server_data(void *data, int type, void *event);
-static int _e_cb_timer(void *data);
+static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event);
+static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event);
+static Eina_Bool _e_cb_timer(void *data);
 static void _e_thumb_generate(E_Thumb *eth);
 static char *_e_thumb_file_id(char *file, char *key);
 
@@ -144,8 +144,8 @@ _e_ipc_init(void)
    return 1;
 }
 
-static int
-_e_ipc_cb_server_add(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Ipc_Event_Server_Add *e;
    
@@ -154,19 +154,19 @@ _e_ipc_cb_server_add(void *data, int type, void *event)
 			 5/*E_IPC_DOMAIN_THUMB*/, 
 			 1/*hello*/, 
 			 0, 0, 0, NULL, 0); /* send hello */
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_ipc_cb_server_del(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    /* quit now */
    ecore_main_loop_quit();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_ipc_cb_server_data(void *data, int type, void *event)
+static Eina_Bool
+_e_ipc_cb_server_data(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Ipc_Event_Server_Data *e;
    E_Thumb *eth;
@@ -175,7 +175,7 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
    char *key = NULL;
    
    e = event;
-   if (e->major != 5/*E_IPC_DOMAIN_THUMB*/) return 1;
+   if (e->major != 5/*E_IPC_DOMAIN_THUMB*/) return ECORE_CALLBACK_PASS_ON;
    switch (e->minor)
      {
       case 1:
@@ -223,10 +223,10 @@ _e_ipc_cb_server_data(void *data, int type, void *event)
       default:
 	break;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_cb_timer(void *data)
 {
    E_Thumb *eth;
@@ -249,7 +249,7 @@ _e_cb_timer(void *data)
      }
    else
      _timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 typedef struct _Color Color;
diff --git a/src/bin/e_utils.c b/src/bin/e_utils.c
index da25724f8..992f411fc 100644
--- a/src/bin/e_utils.c
+++ b/src/bin/e_utils.c
@@ -57,13 +57,13 @@ struct _E_Util_Image_Import_Handle
 };
 
 /* local subsystem functions */
-static int _e_util_cb_delayed_del(void *data);
-static int _e_util_wakeup_cb(void *data);
+static Eina_Bool _e_util_cb_delayed_del(void *data);
+static Eina_Bool _e_util_wakeup_cb(void *data);
 
 static void _e_util_image_import_settings_do(void *data, E_Dialog *dia);
 static void _e_util_image_import_settings_del(void *obj);
 
-static int _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_util_image_import_exit(void *data, int type __UNUSED__, void *event);
 static void _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle);
 
 /* local subsystem globals */
@@ -1409,18 +1409,18 @@ e_util_image_import_cancel(E_Util_Image_Import_Handle *handle)
 }
 
 /* local subsystem functions */
-static int
+static Eina_Bool
 _e_util_cb_delayed_del(void *data)
 {
    e_object_del(E_OBJECT(data));
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
-_e_util_wakeup_cb(void *data)
+static Eina_Bool
+_e_util_wakeup_cb(__UNUSED__ void *data)
 {
    _e_util_dummy_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1445,14 +1445,14 @@ _e_util_image_import_settings_del(void *obj)
    E_FREE(ctxt);
 }
 
-static int
+static Eina_Bool
 _e_util_image_import_exit(void *data, int type __UNUSED__, void *event)
 {
    E_Util_Image_Import_Handle *handle = data;
    Ecore_Exe_Event_Del *ev = event;
    Eina_Bool ok;
 
-   if (ev->exe != handle->exe) return 1;
+   if (ev->exe != handle->exe) return ECORE_CALLBACK_PASS_ON;
 
    ok = (ev->exit_code == 0);
 
@@ -1461,7 +1461,7 @@ _e_util_image_import_exit(void *data, int type __UNUSED__, void *event)
 
    _e_util_image_import_handle_free(handle);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1475,7 +1475,7 @@ _e_util_image_import_handle_free(E_Util_Image_Import_Handle *handle)
    E_FREE(handle);
 }
 
-static int
+static Eina_Bool
 _e_util_conf_timer_old(void *data)
 {
    char *module_name = data;
@@ -1498,10 +1498,10 @@ _e_util_conf_timer_old(void *data)
    e_util_dialog_internal(buf, msg);
    E_FREE(module_name);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_util_conf_timer_new(void *data)
 {
    char *module_name = data;
@@ -1522,7 +1522,7 @@ _e_util_conf_timer_new(void *data)
    e_util_dialog_internal(buf, msg);
    E_FREE(module_name);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 EAPI Eina_Bool
diff --git a/src/bin/e_widget_deskpreview.c b/src/bin/e_widget_deskpreview.c
index 2af62fbd5..5decec3c3 100644
--- a/src/bin/e_widget_deskpreview.c
+++ b/src/bin/e_widget_deskpreview.c
@@ -24,7 +24,7 @@ static void _e_wid_del_hook(Evas_Object *obj);
 static void _e_wid_reconfigure(E_Widget_Data *wd);
 static void _e_wid_desk_cb_config(void *data, Evas *evas, Evas_Object *obj, void *event);
 static void _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void *event);
-static int _e_wid_cb_bg_update(void *data, int type, void *event);
+static Eina_Bool _e_wid_cb_bg_update(void *data, int type, void *event);
 
 EAPI Evas_Object *
 e_widget_deskpreview_add(Evas *evas, int nx, int ny) 
@@ -224,16 +224,16 @@ _e_wid_cb_resize(void *data, Evas *evas, Evas_Object *obj, void *event)
    _e_wid_reconfigure(wd);
 }
 
-static int 
-_e_wid_cb_bg_update(void *data, int type, void *event) 
+static Eina_Bool
+_e_wid_cb_bg_update(void *data, int type, void *event)
 {
    E_Event_Bg_Update *ev;
    E_Widget_Data *wd;
    Eina_List *l;
    Evas_Object *o;
 
-   if (type != E_EVENT_BG_UPDATE) return 1;
-   if (!(wd = data)) return 1;
+   if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
+   if (!(wd = data)) return ECORE_CALLBACK_PASS_ON;
    ev = event;
 
    EINA_LIST_FOREACH(wd->desks, l, o) 
@@ -253,5 +253,5 @@ _e_wid_cb_bg_update(void *data, int type, void *event)
           }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/bin/e_widget_ilist.c b/src/bin/e_widget_ilist.c
index 98ad37c78..99c0064b2 100644
--- a/src/bin/e_widget_ilist.c
+++ b/src/bin/e_widget_ilist.c
@@ -49,12 +49,12 @@ static void _e_wid_cb_item_hilight(void *data, void *data2);
 static void _e_wid_cb_selected(void *data, Evas_Object *obj, void *event_info);
 static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-static int _queue_timer(void *data);
+static Eina_Bool _queue_timer(void *data);
 static void _queue_queue(Evas_Object *obj);
 static void _queue_append(Evas_Object *obj, int command, Evas_Object *icon, Evas_Object *end, const char *label, int header, void (*func) (void *data), void *data, const char *val, int relative, int use_relative, int item);
 static void _queue_remove(Evas_Object *obj, E_Widget_Queue_Item *qi, int del);
 
-static int
+static Eina_Bool
 _queue_timer(void *data)
 {
    Evas_Object *obj;
@@ -180,7 +180,7 @@ _queue_timer(void *data)
    e_widget_ilist_thaw(obj);
    e_widget_ilist_go(obj);
    _queue_queue(obj);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 1f05a542e..be14afc48 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -11,13 +11,13 @@ static void _e_zone_free(E_Zone *zone);
 static void _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info);
 static void _e_zone_event_zone_desk_count_set_free(void *data, void *ev);
-static int _e_zone_cb_mouse_in(void *data, int type, void *event);
-static int _e_zone_cb_mouse_out(void *data, int type, void *event);
-static int _e_zone_cb_mouse_down(void *data, int type, void *event);
-static int _e_zone_cb_mouse_up(void *data, int type, void *event);
-static int _e_zone_cb_mouse_move(void *data, int type, void *event);
-static int _e_zone_cb_desk_after_show(void *data, int type, void *event);
-static int _e_zone_cb_edge_timer(void *data);
+static Eina_Bool _e_zone_cb_mouse_in(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_mouse_out(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_desk_after_show(void *data, int type, void *event);
+static Eina_Bool _e_zone_cb_edge_timer(void *data);
 static void _e_zone_event_move_resize_free(void *data, void *ev);
 static void _e_zone_event_add_free(void *data, void *ev);
 static void _e_zone_event_del_free(void *data, void *ev);
@@ -1092,7 +1092,7 @@ _e_zone_free(E_Zone *zone)
 }
 
 static void
-_e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_e_zone_cb_bg_mouse_down(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
 {
    E_Zone *zone;
 
@@ -1122,7 +1122,7 @@ _e_zone_cb_bg_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_i
 }
 
 static void
-_e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+_e_zone_cb_bg_mouse_up(void *data, __UNUSED__ Evas *evas, __UNUSED__ Evas_Object *obj, __UNUSED__ void *event_info)
 {
    E_Zone *zone;
 
@@ -1156,7 +1156,7 @@ _e_zone_cb_bg_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_inf
 }
 
 static void
-_e_zone_event_zone_desk_count_set_free(void *data, void *ev)
+_e_zone_event_zone_desk_count_set_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Zone_Desk_Count_Set *e;
 
@@ -1165,8 +1165,8 @@ _e_zone_event_zone_desk_count_set_free(void *data, void *ev)
    free(e);
 }
 
-static int
-_e_zone_cb_mouse_in(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_mouse_in(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev;
    E_Event_Zone_Edge *zev;
@@ -1177,7 +1177,7 @@ _e_zone_cb_mouse_in(void *data, int type, void *event)
    zone = data;
 
    edge = _e_zone_detect_edge(zone, ev->win);
-   if (edge == E_ZONE_EDGE_NONE) return 1;
+   if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
 
    zev = E_NEW(E_Event_Zone_Edge, 1);
    zev->zone = zone;
@@ -1188,11 +1188,11 @@ _e_zone_cb_mouse_in(void *data, int type, void *event)
    ecore_event_add(E_EVENT_ZONE_EDGE_IN, zev, NULL, NULL);
    e_bindings_edge_in_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_zone_cb_mouse_out(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_mouse_out(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_Out *ev;
    E_Event_Zone_Edge *zev;
@@ -1203,7 +1203,7 @@ _e_zone_cb_mouse_out(void *data, int type, void *event)
    zone = data;
 
    edge = _e_zone_detect_edge(zone, ev->win);
-   if (edge == E_ZONE_EDGE_NONE) return 1;
+   if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
 
    zev = E_NEW(E_Event_Zone_Edge, 1);
    zev->zone = zone;
@@ -1213,11 +1213,11 @@ _e_zone_cb_mouse_out(void *data, int type, void *event)
    zev->modifiers = ev->modifiers;
    ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
    e_bindings_edge_out_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_zone_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_mouse_down(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Event_Zone_Edge *zev;
@@ -1228,7 +1228,7 @@ _e_zone_cb_mouse_down(void *data, int type, void *event)
    zone = data;
 
    edge = _e_zone_detect_edge(zone, ev->window);
-   if (edge == E_ZONE_EDGE_NONE) return 1;
+   if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
 
    zev = E_NEW(E_Event_Zone_Edge, 1);
    zev->zone = zone;
@@ -1238,11 +1238,11 @@ _e_zone_cb_mouse_down(void *data, int type, void *event)
    zev->modifiers = ev->modifiers;
    ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
    e_bindings_edge_down_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_zone_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Event_Zone_Edge *zev;
@@ -1253,7 +1253,7 @@ _e_zone_cb_mouse_up(void *data, int type, void *event)
    zone = data;
 
    edge = _e_zone_detect_edge(zone, ev->window);
-   if (edge == E_ZONE_EDGE_NONE) return 1;
+   if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
 
    zev = E_NEW(E_Event_Zone_Edge, 1);
    zev->zone = zone;
@@ -1263,11 +1263,11 @@ _e_zone_cb_mouse_up(void *data, int type, void *event)
    zev->modifiers = ev->modifiers;
    ecore_event_add(E_EVENT_ZONE_EDGE_OUT, zev, NULL, NULL);
    e_bindings_edge_up_event_handle(E_BINDING_CONTEXT_ZONE, E_OBJECT(zone), zev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_zone_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_mouse_move(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    E_Event_Zone_Edge *zev;
@@ -1278,7 +1278,7 @@ _e_zone_cb_mouse_move(void *data, int type, void *event)
    zone = data;
 
    edge = _e_zone_detect_edge(zone, ev->window);
-   if (edge == E_ZONE_EDGE_NONE) return 1;
+   if (edge == E_ZONE_EDGE_NONE) return ECORE_CALLBACK_PASS_ON;
 
    zev = E_NEW(E_Event_Zone_Edge, 1);
    zev->zone = zone;
@@ -1287,24 +1287,24 @@ _e_zone_cb_mouse_move(void *data, int type, void *event)
    zev->y = ev->root.y;
    zev->modifiers = ev->modifiers;
    ecore_event_add(E_EVENT_ZONE_EDGE_MOVE, zev, NULL, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_zone_cb_desk_after_show(void *data, int type, void *event)
+static Eina_Bool
+_e_zone_cb_desk_after_show(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Desk_Show *ev;
    E_Zone *zone;
 
    ev = event;
    zone = data;
-   if (ev->desk->zone != zone) return 1;
+   if (ev->desk->zone != zone) return ECORE_CALLBACK_PASS_ON;
 
    zone->flip.switching = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_zone_cb_edge_timer(void *data)
 {
    E_Zone *zone;
@@ -1315,7 +1315,7 @@ _e_zone_cb_edge_timer(void *data)
    if (!act)
      {
 	E_FREE(zone->flip.ev);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    if (act->func.go_edge)
@@ -1326,11 +1326,11 @@ _e_zone_cb_edge_timer(void *data)
    zone->flip.bind->timer = NULL;
 
    E_FREE(zone->flip.ev);
-   return 0;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
-_e_zone_event_move_resize_free(void *data, void *ev)
+_e_zone_event_move_resize_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Zone_Move_Resize *e;
 
@@ -1340,7 +1340,7 @@ _e_zone_event_move_resize_free(void *data, void *ev)
 }
 
 static void
-_e_zone_event_add_free(void *data, void *ev)
+_e_zone_event_add_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Zone_Add *e;
 
@@ -1350,7 +1350,7 @@ _e_zone_event_add_free(void *data, void *ev)
 }
 
 static void
-_e_zone_event_del_free(void *data, void *ev)
+_e_zone_event_del_free(__UNUSED__ void *data, void *ev)
 {
    E_Event_Zone_Del *e;
 
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index c599b8173..b3285ae97 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -30,7 +30,7 @@ typedef struct _E_Event_Zone_Edge               E_Event_Zone_Edge;
 #ifndef E_ZONE_H
 #define E_ZONE_H
 
-#define E_ZONE_TYPE 0xE0b0100d
+#define E_ZONE_TYPE (int) 0xE0b0100d
 
 struct _E_Zone
 {
diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index f808197f2..f384b0c41 100644
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -52,7 +52,7 @@
 #define CHECK_SYS_CLASS_POWER_SUPPLY  4
 
 static void init(void);
-static int poll_cb(void *data);
+static Eina_Bool poll_cb(void *data);
 
 static int poll_interval = 512;
 static Ecore_Poller *poller = NULL;
@@ -423,7 +423,7 @@ darwin_check(void)
 /* new linux power class api to get power info - brand new and this code
  * may have bugs, but it is a good attempt to get it right */
 #if 0
-static int linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
+static Eina_Bool linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler);
 static void linux_sys_class_power_supply_check(void);
 #endif
 static void linux_sys_class_power_supply_init(void);
@@ -455,18 +455,18 @@ static Eina_List *events = NULL;
 #if 0
 static Ecore_Timer *sys_class_delay_check = NULL;
 
-static int
+static Eina_Bool
 linux_sys_class_power_supply_cb_delay_check(void *data)
 {
    linux_sys_class_power_supply_init();
    poll_cb(NULL);
    sys_class_delay_check = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static Ecore_Timer *re_init_timer = NULL;
 
-static int
+static Eina_Bool
 linux_sys_class_power_supply_cb_re_init(void *data)
 {
    Sys_Class_Power_Supply_Uevent *sysev;
@@ -484,10 +484,10 @@ linux_sys_class_power_supply_cb_re_init(void *data)
      }
    linux_sys_class_power_supply_init();
    re_init_timer = NULL;
-   return 0;
-}     
+   return ECORE_CALLBACK_CANCEL;
+}
 
-static int
+static Eina_Bool
 linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd_handler)
 {
    Sys_Class_Power_Supply_Uevent *sysev;
@@ -531,7 +531,7 @@ linux_sys_class_power_supply_cb_event_fd_active(void *data, Ecore_Fd_Handler *fd
 	     sys_class_delay_check = ecore_timer_add(0.2, linux_sys_class_power_supply_cb_delay_check, NULL);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_CANCEL;
 }
 #endif
 static void
@@ -870,9 +870,9 @@ linux_sys_class_power_supply_check(void)
  * linux_sys_class_power_supply_init/check() though as this is the new
  * power class api to poll for power stuff
  */
-static int linux_acpi_cb_acpid_add(void *data, int type, void *event);
-static int linux_acpi_cb_acpid_del(void *data, int type, void *event);
-static int linux_acpi_cb_acpid_data(void *data, int type, void *event);
+static Eina_Bool linux_acpi_cb_acpid_add(void *data, int type, void *event);
+static Eina_Bool linux_acpi_cb_acpid_del(void *data, int type, void *event);
+static Eina_Bool linux_acpi_cb_acpid_data(void *data, int type, void *event);
 static void linux_acpi_init(void);
 static void linux_acpi_check(void);
 
@@ -886,22 +886,22 @@ static Ecore_Timer *delay_check = NULL;
 static int event_fd = -1;
 static Ecore_Fd_Handler *event_fd_handler = NULL;
 
-static int
+static Eina_Bool
 linux_acpi_cb_delay_check(void *data __UNUSED__)
 {
    linux_acpi_init();
    poll_cb(NULL);
    delay_check = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 linux_acpi_cb_acpid_add(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 linux_acpi_cb_acpid_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    ecore_con_server_del(acpid);
@@ -912,18 +912,18 @@ linux_acpi_cb_acpid_del(void *data __UNUSED__, int type __UNUSED__, void *event
    acpid_handler_del = NULL;
    if (acpid_handler_data) ecore_event_handler_del(acpid_handler_data);
    acpid_handler_data = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 linux_acpi_cb_acpid_data(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
 {
    if (delay_check) ecore_timer_del(delay_check);
    delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 linux_acpi_cb_event_fd_active(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler)
 {
    if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ))
@@ -957,7 +957,7 @@ linux_acpi_cb_event_fd_active(void *data __UNUSED__, Ecore_Fd_Handler *fd_handle
 	     delay_check = ecore_timer_add(0.2, linux_acpi_cb_delay_check, NULL);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -1478,7 +1478,7 @@ init(void)
 #endif
 }
 
-static int
+static Eina_Bool
 poll_cb(void *data __UNUSED__)
 {
    int ptime_left;
@@ -1511,7 +1511,7 @@ poll_cb(void *data __UNUSED__)
      }
 #elif defined(HAVE_CFBASE_H) /* OS X */
    darwin_check();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 #else
    switch (mode)
      {
@@ -1548,7 +1548,7 @@ poll_cb(void *data __UNUSED__)
 		 battery_full, time_left, time_left, have_battery, have_power);
 	fflush(stdout);
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 int
diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index e0b0e0f33..67dc765fa 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -39,15 +39,15 @@ struct _Instance
 };
 
 static void _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery, Eina_Bool have_power);
-static int _battery_cb_exe_data(void *data, int type, void *event);
-static int _battery_cb_exe_del(void *data, int type, void *event);
+static Eina_Bool _battery_cb_exe_data(void *data, int type, void *event);
+static Eina_Bool _battery_cb_exe_del(void *data, int type, void *event);
 static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _menu_cb_post(void *data, E_Menu *m);
 static void _battery_face_level_set(Evas_Object *battery, double level);
 static void _battery_face_time_set(Evas_Object *battery, int time);
 static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
 
-static int  _battery_cb_warning_popup_timeout(void *data);
+static Eina_Bool  _battery_cb_warning_popup_timeout(void *data);
 static void _battery_cb_warning_popup_hide(void *data, Evas *e, Evas_Object *obj, void *event);
 static void _battery_warning_popup_destroy(Instance *inst);
 static void _battery_warning_popup(Instance *inst, int time, double percent);
@@ -407,7 +407,7 @@ _battery_config_updated(void)
      }
 }
 
-static int
+static Eina_Bool
 _battery_cb_warning_popup_timeout(void *data)
 {
    Instance *inst;
@@ -415,7 +415,7 @@ _battery_cb_warning_popup_timeout(void *data)
    inst = data;
    e_gadcon_popup_hide(inst->warning);
    battery_config->alert_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -602,7 +602,7 @@ _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery,
    battery_config->have_power = have_power;
 }
 
-static int
+static Eina_Bool
 _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Data *ev;
@@ -611,7 +611,7 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
    int i;
 
    ev = event;
-   if (ev->exe != battery_config->batget_exe) return 1;
+   if (ev->exe != battery_config->batget_exe) return ECORE_CALLBACK_PASS_ON;
    if ((ev->lines) && (ev->lines[0].line))
      {
 
@@ -655,18 +655,18 @@ _battery_cb_exe_data(void *data __UNUSED__, int type __UNUSED__, void *event)
                }
           }
      }
-   return 0;
-}                          
+   return ECORE_CALLBACK_DONE;
+}
 
-static int
+static Eina_Bool
 _battery_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *ev;
 
    ev = event;
-   if (ev->exe != battery_config->batget_exe) return 1;
+   if (ev->exe != battery_config->batget_exe) return ECORE_CALLBACK_PASS_ON;
    battery_config->batget_exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /* module setup */
diff --git a/src/modules/bluez/e_mod_main.c b/src/modules/bluez/e_mod_main.c
index ae8577fa9..1db99ff48 100644
--- a/src/modules/bluez/e_mod_main.c
+++ b/src/modules/bluez/e_mod_main.c
@@ -189,21 +189,21 @@ _bluez_cb_toggle_powered(E_Object *obj __UNUSED__, const char *params __UNUSED__
 
 static void _bluez_popup_del(E_Bluez_Instance *inst);
 
-static int
+static Eina_Bool
 _bluez_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
    E_Bluez_Instance *inst = data;
 
    if (ev->window != inst->ui.input.win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    _bluez_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _bluez_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -211,13 +211,13 @@ _bluez_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
    const char *keysym;
 
    if (ev->window != inst->ui.input.win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    keysym = ev->key;
    if (strcmp(keysym, "Escape") == 0)
      _bluez_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -549,7 +549,7 @@ _bluez_popup_device_selected(void *data)
      }
 }
 
-static int
+static Eina_Bool
 _bluez_event_devicefound(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Bluez_Module_Context *ctxt = data;
@@ -1096,7 +1096,7 @@ _bluez_actions_unregister(E_Bluez_Module_Context *ctxt)
      }
 }
 
-static int
+static Eina_Bool
 _bluez_manager_changed_do(void *data)
 {
    E_Bluez_Module_Context *ctxt = data;
@@ -1104,7 +1104,7 @@ _bluez_manager_changed_do(void *data)
    //FIXME: reload the default adapter maybe?
 
    ctxt->poller.manager_changed = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1178,7 +1178,7 @@ _default_adapter_callback(void *data, DBusMessage *msg, DBusError *err __UNUSED_
      }
 }
 
-static int
+static Eina_Bool
 _bluez_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Bluez_Module_Context *ctxt = data;
@@ -1188,14 +1188,14 @@ _bluez_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
 
    element = e_bluez_manager_get();
    if (!e_bluez_manager_default_adapter(_default_adapter_callback, ctxt))
-     return 0;
+     return ECORE_CALLBACK_DONE;
 
    e_bluez_element_listener_add(element, _bluez_manager_changed, ctxt, NULL);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _bluez_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Bluez_Module_Context *ctxt = data;
@@ -1203,10 +1203,10 @@ _bluez_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__
    ctxt->has_manager = EINA_FALSE;
    eina_stringshare_replace(&ctxt->default_adapter, NULL);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Bluez_Module_Context *ctxt = data;
@@ -1215,7 +1215,7 @@ _bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUS
    E_Bluez_Instance *inst;
    Eina_List *l;
 
-   if (!e_bluez_element_is_adapter(element)) return 1;
+   if (!e_bluez_element_is_adapter(element)) return ECORE_CALLBACK_PASS_ON;
 
    if (!e_bluez_adapter_powered_get(element, &powered))
      powered = EINA_FALSE;
@@ -1236,7 +1236,7 @@ _bluez_event_element_updated(void *data, int type __UNUSED__, void *event __UNUS
 	_bluez_gadget_update(inst);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/comp/e_mod_comp.c b/src/modules/comp/e_mod_comp.c
index 814afb108..8fa7ae8a3 100644
--- a/src/modules/comp/e_mod_comp.c
+++ b/src/modules/comp/e_mod_comp.c
@@ -515,16 +515,16 @@ _e_mod_comp_pre_swap(void *data, Evas *e)
      }
 }
 
-static int
+static Eina_Bool
 _e_mod_comp_cb_delayed_update_timer(void *data)
 {
    E_Comp *c = data;
    _e_mod_comp_render_queue(c);
    c->new_up_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _e_mod_comp_cb_update(E_Comp *c)
 {
    E_Comp_Win *cw;
@@ -759,9 +759,9 @@ _e_mod_comp_cb_update(E_Comp *c)
      {
         c->render_overflow = 0;
         if (c->render_animator) c->render_animator = NULL;
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -771,7 +771,7 @@ _e_mod_comp_cb_job(void *data)
    _e_mod_comp_cb_update(data);
 }
 
-static int
+static Eina_Bool
 _e_mod_comp_cb_animator(void *data)
 {
    return _e_mod_comp_cb_update(data);
@@ -863,7 +863,7 @@ _e_mod_comp_win_do_shadow(E_Comp_Win *cw)
    return 1;
 }
 
-static int
+static Eina_Bool
 _e_mod_comp_win_damage_timeout(void *data)
 {
    E_Comp_Win *cw = data;
@@ -881,7 +881,7 @@ _e_mod_comp_win_damage_timeout(void *data)
    cw->drawme = 1;
    _e_mod_comp_win_render_queue(cw);
    cw->update_timeout = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1748,72 +1748,72 @@ _e_mod_comp_win_reshape(E_Comp_Win *cw)
 
 //////////////////////////////////////////////////////////////////////////
 
-static int
-_e_mod_comp_create(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_create(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Create *ev = event;
    E_Comp_Win *cw;
    E_Comp *c = _e_mod_comp_find(ev->parent);
-   if (!c) return 1;
-   if (_e_mod_comp_win_find(ev->win)) return 1;
-   if (c->win == ev->win) return 1;
-   if (c->ee_win == ev->win) return 1;
+   if (!c) return ECORE_CALLBACK_PASS_ON;
+   if (_e_mod_comp_win_find(ev->win)) return ECORE_CALLBACK_PASS_ON;
+   if (c->win == ev->win) return ECORE_CALLBACK_PASS_ON;
+   if (c->ee_win == ev->win) return ECORE_CALLBACK_PASS_ON;
    cw = _e_mod_comp_win_add(c, ev->win);
    if (cw) _e_mod_comp_win_configure(cw, ev->x, ev->y, ev->w, ev->h, ev->border);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_destroy(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_destroy(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Destroy *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    if (cw->animating) cw->delete_me = 1;
    else _e_mod_comp_win_del(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_show(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Show *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
-   if (cw->visible) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
+   if (cw->visible) return ECORE_CALLBACK_PASS_ON;
    _e_mod_comp_win_show(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_hide(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Hide *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
-   if (!cw->visible) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
+   if (!cw->visible) return ECORE_CALLBACK_PASS_ON;
    _e_mod_comp_win_hide(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_reparent(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_reparent(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Reparent *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    DBG("== repar [0x%x] to [0x%x]\n", ev->win, ev->parent);
    if (ev->parent != cw->c->man->root)
      _e_mod_comp_win_del(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_configure(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_configure(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Configure *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->abovewin == 0)
      {
@@ -1838,38 +1838,38 @@ _e_mod_comp_configure(void *data, int type, void *event)
      {
         _e_mod_comp_win_configure(cw, ev->x, ev->y, ev->w, ev->h, ev->border);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_stack(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_stack(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Stack *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    if (ev->detail == ECORE_X_WINDOW_STACK_ABOVE) _e_mod_comp_win_raise(cw);
    else _e_mod_comp_win_lower(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_property(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Property *ev = event;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_message(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Client_Message *ev = event;
    E_Comp_Win *cw = NULL;
    if ((ev->message_type != ECORE_X_ATOM_E_COMP_SYNC_DRAW_DONE) ||
-       (ev->format != 32)) return 1;
+       (ev->format != 32)) return ECORE_CALLBACK_PASS_ON;
    cw = _e_mod_comp_border_client_find(ev->data.l[0]);
-   if (!cw) return 1;
-   if (!cw->bd) return 1;
-   if (ev->data.l[0] != cw->bd->client.win) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
+   if (!cw->bd) return ECORE_CALLBACK_PASS_ON;
+   if (ev->data.l[0] != cw->bd->client.win) return ECORE_CALLBACK_PASS_ON;
    if (cw->bd)
      {
         if (cw->counter)
@@ -1888,33 +1888,33 @@ _e_mod_comp_message(void *data, int type, void *event)
              _e_mod_comp_win_render_queue(cw);
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_shape(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_shape(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Shape *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    _e_mod_comp_win_reshape(cw);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_damage(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_damage(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Damage *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_damage_find(ev->damage);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    _e_mod_comp_win_damage(cw, 
                           ev->area.x, ev->area.y, 
                           ev->area.width, ev->area.height, 1); 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_damage_win(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_damage_win(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Window_Damage *ev = event;
    Eina_List *l;
@@ -1931,11 +1931,11 @@ _e_mod_comp_damage_win(void *data, int type, void *event)
              break;
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_randr(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_randr(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Eina_List *l;
    E_Comp *c;
@@ -1944,136 +1944,136 @@ _e_mod_comp_randr(void *data, int type, void *event)
      {
         ecore_evas_resize(c->ee, c->man->w, c->man->h);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_add(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: add/enable compositing here not in show event for borders
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_del(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    if (cw->bd == ev->border) _e_mod_comp_object_del(cw, ev->border);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_show(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Show *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: show compwin here
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_hide(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Hide *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: hide compwin here
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_move(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Move *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: do move here for composited bd
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Resize *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: do resize here instead of conf notify
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_iconify(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Iconify *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: special iconfiy anim
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_uniconify(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Uniconify *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: special uniconfiy anim
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_urgent_change(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Urgent_Change *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    if (cw->bd->client.icccm.urgent)
      edje_object_signal_emit(cw->shobj, "e,state,urgent,on", "e");
    else
      edje_object_signal_emit(cw->shobj, "e,state,urgent,off", "e");
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_focus_in(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    edje_object_signal_emit(cw->shobj, "e,state,focus,on", "e");
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    edje_object_signal_emit(cw->shobj, "e,state,focus,off", "e");
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_mod_comp_bd_property(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_bd_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Property *ev = event;
    E_Comp_Win *cw = _e_mod_comp_win_find(ev->border->win);
-   if (!cw) return 1;
+   if (!cw) return ECORE_CALLBACK_PASS_ON;
    // fimxe: other properties?
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 //////////////////////////////////////////////////////////////////////////
 
-static int
-_e_mod_comp_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_comp_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev = event;
    
@@ -2092,7 +2092,7 @@ _e_mod_comp_key_down(void *data, int type, void *event)
              e_sys_action_do(E_SYS_RESTART, NULL);
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/modules/comp/e_mod_config.c b/src/modules/comp/e_mod_config.c
index 5e6a488c9..47740c3ce 100644
--- a/src/modules/comp/e_mod_config.c
+++ b/src/modules/comp/e_mod_config.c
@@ -236,7 +236,7 @@ _shadow_changed(void *data, Evas_Object *obj, void *event_info)
      }
 }
 
-static int
+static Eina_Bool
 _style_demo(void *data)
 {
    Eina_List *style_shadows, *l;
@@ -276,7 +276,7 @@ _style_demo(void *data)
 	      break;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/src/modules/conf/e_conf.c b/src/modules/conf/e_conf.c
index c6d354913..5245bfc5f 100644
--- a/src/modules/conf/e_conf.c
+++ b/src/modules/conf/e_conf.c
@@ -57,7 +57,7 @@ static void _e_configure_item_cb(void *data);
 static void _e_configure_focus_cb(void *data, Evas_Object *obj);
 static void _e_configure_keydown_cb(void *data, Evas *e, Evas_Object *obj, void *event);
 static void _e_configure_fill_cat_list(void *data);
-static int  _e_configure_module_update_cb(void *data, int type, void *event);
+static Eina_Bool  _e_configure_module_update_cb(void *data, int type, void *event);
 
 static E_Configure *_e_configure = NULL;
 
@@ -513,16 +513,16 @@ _e_configure_fill_cat_list(void *data)
    evas_event_thaw(evas_object_evas_get(eco->cat_list));
 }
 
-static int
+static Eina_Bool
 _e_configure_module_update_cb(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Configure *eco;
    int sel = 0;
 
-   if (!(eco = data)) return 1;
-   if (!eco->cat_list) return 1;
+   if (!(eco = data)) return ECORE_CALLBACK_PASS_ON;
+   if (!eco->cat_list) return ECORE_CALLBACK_PASS_ON;
    sel = e_widget_toolbar_item_selected_get(eco->cat_list);
    _e_configure_fill_cat_list(eco);
    e_widget_toolbar_item_select(eco->cat_list, sel);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index d9523dbf2..0be79e742 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -23,7 +23,7 @@ static void _cb_button_click(void *data, void *data2);
 
 static void _conf_new(void);
 static void _conf_free(void);
-static int _conf_timer(void *data);
+static Eina_Bool _conf_timer(void *data);
 
 static E_Module *conf_module = NULL;
 static E_Action *act = NULL;
@@ -477,10 +477,10 @@ _conf_free(void)
    E_FREE(conf);
 }
 
-static int
-_conf_timer(void *data)
+static Eina_Bool
+_conf_timer(__UNUSED__ void *data)
 {
    e_util_dialog_show(_("Configuration Panel Configuration Updated"),
 		      "%s", (char *)data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/conf_acpibindings/e_int_config_acpibindings.c b/src/modules/conf_acpibindings/e_int_config_acpibindings.c
index f73d1cdb1..1de75244c 100644
--- a/src/modules/conf_acpibindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_acpibindings/e_int_config_acpibindings.c
@@ -33,8 +33,8 @@ static void _cb_actions_changed(void *data);
 static void _cb_entry_changed(void *data, void *data2 __UNUSED__);
 static void _cb_add_binding(void *data, void *data2 __UNUSED__);
 static void _cb_del_binding(void *data, void *data2 __UNUSED__);
-static int _cb_grab_key_down(void *data, int type __UNUSED__, void *event);
-static int _cb_acpi_event(void *data, int type, void *event);
+static Eina_Bool _cb_grab_key_down(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _cb_acpi_event(void *data, int type, void *event);
 
 /* local variables */
 static E_Dialog *grab_dlg = NULL;
@@ -570,15 +570,15 @@ _cb_del_binding(void *data, void *data2 __UNUSED__)
    _fill_bindings(cfdata);
 }
 
-static int 
+static Eina_Bool
 _cb_grab_key_down(void *data, int type __UNUSED__, void *event) 
 {
    E_Config_Dialog_Data *cfdata;
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->window != grab_win) return 1;
-   if (!(cfdata = data)) return 1;
+   if (ev->window != grab_win) return ECORE_CALLBACK_PASS_ON;
+   if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
    if (!strcmp(ev->keyname, "Escape")) 
      {
 	Ecore_Event_Handler *hdl;
@@ -597,11 +597,11 @@ _cb_grab_key_down(void *data, int type __UNUSED__, void *event)
 	/* unfreeze acpi events */
 	e_acpi_events_thaw();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_cb_acpi_event(void *data, int type, void *event) 
+static Eina_Bool
+_cb_acpi_event(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Acpi *ev;
    E_Config_Dialog_Data *cfdata;
@@ -609,7 +609,7 @@ _cb_acpi_event(void *data, int type, void *event)
    Ecore_Event_Handler *hdl;
 
    ev = event;
-   if (!(cfdata = data)) return 1;
+   if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
 
    /* free the handlers */
    EINA_LIST_FREE(grab_hdls, hdl)
@@ -637,5 +637,5 @@ _cb_acpi_event(void *data, int type, void *event)
 
    cfdata->bindings = eina_list_append(cfdata->bindings, bind);
    _fill_bindings(cfdata);
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index 50a3ea284..905be6535 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -33,7 +33,7 @@ static void _cb_add(void *data, void *data2 __UNUSED__);
 static void _cb_del(void *data, void *data2 __UNUSED__);
 static void _cb_up(void *data, void *data2 __UNUSED__);
 static void _cb_down(void *data, void *data2 __UNUSED__);
-static int _cb_fill_delay(void *data);
+static Eina_Bool _cb_fill_delay(void *data);
 
 E_Config_Dialog *
 e_int_config_apps_add(E_Container *con, const char *params __UNUSED__) 
@@ -606,17 +606,17 @@ _cb_down(void *data, void *data2 __UNUSED__)
    evas_event_thaw(evas);
 }
 
-static int 
-_cb_fill_delay(void *data) 
+static Eina_Bool
+_cb_fill_delay(void *data)
 {
    E_Config_Dialog_Data *cfdata;
    int mw;
 
-   if (!(cfdata = data)) return 1;
+   if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
    _fill_apps_list(cfdata);
    e_widget_size_min_get(cfdata->o_list, &mw, NULL);
    if (mw < (200 * e_scale)) mw = (200 * e_scale);
    e_widget_size_min_set(cfdata->o_list, mw, (75 * e_scale));
    cfdata->fill_delay = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/conf_colors/e_int_config_color_classes.c b/src/modules/conf_colors/e_int_config_color_classes.c
index db202b317..9168691cd 100644
--- a/src/modules/conf_colors/e_int_config_color_classes.c
+++ b/src/modules/conf_colors/e_int_config_color_classes.c
@@ -140,8 +140,8 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Co
 static void _config_color_class_free(CFColor_Class *ccc);
 static void _config_color_class_icon_state_apply(CFColor_Class *ccc);
 static void _config_color_class_end_state_apply(CFColor_Class *ccc);
-static int _fill_data_delayed(void *data);
-static int _color_changed_delay(void *data);
+static Eina_Bool _fill_data_delayed(void *data);
+static Eina_Bool _color_changed_delay(void *data);
 
 E_Config_Dialog *
 e_int_config_color_classes(E_Container *con, const char *params __UNUSED__)
@@ -192,7 +192,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
    E_FREE(cfdata);
 }
 
-static int
+static Eina_Bool
 _color_class_list_selection_idler(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
@@ -316,7 +316,7 @@ _color_class_list_selection_idler(void *data)
 
    cfdata->populating = EINA_FALSE;
    cfdata->selection_idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -456,7 +456,7 @@ _custom_color_cb_change(void *data, Evas_Object *obj)
    _color_class_list_selection_changed(cfdata, NULL);
 }
 
-static int
+static Eina_Bool
 _color_changed_delay(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
@@ -475,7 +475,7 @@ _color_changed_delay(void *data)
       col[2].r, col[2].g, col[2].b, col[2].a);
 
    cfdata->delay_color_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -880,11 +880,11 @@ _fill_data(E_Config_Dialog_Data *cfdata)
      }
 }
 
-static int
+static Eina_Bool
 _fill_data_delayed(void *data)
 {
    E_Config_Dialog_Data *cfdata = data;
    cfdata->delay_load_timer = NULL;
    _fill_data(cfdata);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/conf_desk/e_int_config_desk.c b/src/modules/conf_desk/e_int_config_desk.c
index f53c122de..826d37285 100644
--- a/src/modules/conf_desk/e_int_config_desk.c
+++ b/src/modules/conf_desk/e_int_config_desk.c
@@ -5,7 +5,7 @@ static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _cb_config(void *data, void *data2);
-static int _cb_bg_change(void *data, int type, void *event);
+static Eina_Bool _cb_bg_change(void *data, int type, void *event);
 
 struct _E_Config_Dialog_Data 
 {
@@ -184,26 +184,26 @@ _cb_config(void *data, void *data2)
    e_configure_registry_call("internal/wallpaper_desk", e_container_current_get(e_manager_current_get()), buf);
 }
 
-static int
-_cb_bg_change(void *data, int type, void *event) 
+static Eina_Bool
+_cb_bg_change(void *data, int type, void *event)
 {
    E_Event_Bg_Update *ev;
    E_Config_Dialog_Data *cfdata;
    const char *file;
    
-   if (type != E_EVENT_BG_UPDATE) return 1;
+   if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
    
    cfdata = data;
    ev = event;
-   if (ev->container != cfdata->con_num) return 1;
-   if (ev->zone != cfdata->zone_num) return 1;
-   if (ev->desk_x != cfdata->desk_x) return 1;
-   if (ev->desk_y != cfdata->desk_y) return 1;
+   if (ev->container != cfdata->con_num) return ECORE_CALLBACK_PASS_ON;
+   if (ev->zone != cfdata->zone_num) return ECORE_CALLBACK_PASS_ON;
+   if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
+   if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;
    
    file = e_bg_file_get(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
    E_FREE(cfdata->bg);
    cfdata->bg = strdup(file);
    e_widget_preview_edje_set(cfdata->preview, cfdata->bg, "e/desktop/background");
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/conf_display/e_int_config_display.c b/src/modules/conf_display/e_int_config_display.c
index a609f42ad..d188820ba 100644
--- a/src/modules/conf_display/e_int_config_display.c
+++ b/src/modules/conf_display/e_int_config_display.c
@@ -17,8 +17,8 @@ static Evas_Object *_basic_create_widgets    (E_Config_Dialog *cfd, Evas *evas,
 static void         _load_resolutions        (E_Config_Dialog_Data *cfdata);
 static void         _load_rates              (E_Config_Dialog_Data *cfdata);
 static void         _ilist_item_change       (void *data);
-static int          _deferred_noxrandr_error (void *data);
-static int          _deferred_norates_error  (void *data);
+static Eina_Bool    _deferred_noxrandr_error (void *data);
+static Eina_Bool    _deferred_norates_error  (void *data);
 static int	    _sort_resolutions	     (const void *d1, const void *d2);
 
 typedef struct _Resolution Resolution;
@@ -158,7 +158,7 @@ _surebox_text_fill(SureBox *sb)
    e_dialog_text_set(sb->dia, buf);
 }
 
-static int
+static Eina_Bool
 _surebox_timer_cb(void *data)
 {
    SureBox *sb;
@@ -169,9 +169,9 @@ _surebox_timer_cb(void *data)
    if (sb->iterations == 0)
      {
 	_surebox_dialog_cb_no(sb, sb->dia);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static SureBox *
@@ -525,7 +525,7 @@ _load_resolutions(E_Config_Dialog_Data *cfdata)
 
    evas = evas_object_evas_get(cfdata->res_list);
    if (e_widget_ilist_count(cfdata->res_list) !=
-        eina_list_count(cfdata->resolutions))
+       (int) eina_list_count(cfdata->resolutions))
      {
 	evas_event_freeze(evas);
 	edje_freeze();
@@ -630,7 +630,7 @@ _ilist_item_change(void *data)
    _load_rates(data);
 }
 
-static int
+static Eina_Bool
 _deferred_noxrandr_error(void *data __UNUSED__)
 {
    e_util_dialog_show(_("Missing Features"),
@@ -640,10 +640,10 @@ _deferred_noxrandr_error(void *data __UNUSED__)
 			"the support of this extension. It could also be<br>"
 			"that at the time <hilight>ecore</hilight> was built, there<br>"
 			"was no XRandR support detected."));
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _deferred_norates_error(void *data __UNUSED__)
 {
    e_util_dialog_show(_("No Refresh Rates Found"),
@@ -652,5 +652,5 @@ _deferred_norates_error(void *data __UNUSED__)
 			"this is to be expected. However, if you are not, then<br>"
 			"the current refresh rate will be used when setting<br>"
 			"the resolution, which may cause <hilight>damage</hilight> to your screen."));
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/conf_icon_theme/e_int_config_icon_themes.c b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
index c646c6617..e5022ac8b 100644
--- a/src/modules/conf_icon_theme/e_int_config_icon_themes.c
+++ b/src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -156,7 +156,7 @@ struct _fill_icon_themes_data
    Eina_Bool themes_loaded;
 };
 
-static int
+static Eina_Bool
 _fill_icon_themes(void *data)
 {
    struct _fill_icon_themes_data *d = data;
@@ -179,7 +179,7 @@ _fill_icon_themes(void *data)
 	d->l = d->cfdata->icon_themes;
 	d->i = 0;
 	d->themes_loaded = 1;
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
 
    if (!d->l)
@@ -189,7 +189,7 @@ _fill_icon_themes(void *data)
 	d->cfdata->populating = EINA_FALSE;
 	_populate_preview(d->cfdata);
 	free(d);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    theme = d->l->data;
@@ -217,7 +217,7 @@ _fill_icon_themes(void *data)
 
    d->i++;
    d->l = d->l->next;
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c
index 1bf70ab54..4e124dec1 100644
--- a/src/modules/conf_keybindings/e_int_config_keybindings.c
+++ b/src/modules/conf_keybindings/e_int_config_keybindings.c
@@ -45,8 +45,8 @@ static int _key_binding_sort_cb(const void *d1, const void *d2);
 
 /**************** grab window *******/
 static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
-static int _grab_key_down_cb(void *data, int type, void *event);
-static int _grab_mouse_dumb_cb(void *data, int type, void *event);
+static Eina_Bool _grab_key_down_cb(void *data, int type, void *event);
+static Eina_Bool _grab_mouse_dumb_cb(void *data, int type, void *event);
 
 struct _E_Config_Dialog_Data
 {
@@ -978,8 +978,8 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
    cfdata->locals.dia = NULL;
 }
 
-static int
-_grab_key_down_cb(void *data, int type, void *event)
+static Eina_Bool
+_grab_key_down_cb(void *data, __UNUSED__ int type, void *event)
 {
    E_Config_Dialog_Data *cfdata;
    Ecore_Event_Key *ev;
@@ -987,7 +987,7 @@ _grab_key_down_cb(void *data, int type, void *event)
    ev = event;
    cfdata = data;
 
-   if (ev->window != cfdata->locals.bind_win) return 1;
+   if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
 
    if (!strcmp(ev->keyname, "Escape") &&
        !(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
@@ -1167,13 +1167,13 @@ _grab_key_down_cb(void *data, int type, void *event)
 	     _grab_wnd_hide(cfdata);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_grab_mouse_dumb_cb(void *data, int type, void *event)
+static Eina_Bool
+_grab_mouse_dumb_cb(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 /********** Helper *********************************/
diff --git a/src/modules/conf_mousebindings/e_int_config_mousebindings.c b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
index 10f527170..bf12d5454 100644
--- a/src/modules/conf_mousebindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_mousebindings/e_int_config_mousebindings.c
@@ -47,9 +47,9 @@ static int _wheel_binding_sort_cb(const void *d1, const void *d2);
 /********* grab window **********/
 static void _grab_wnd_show(E_Config_Dialog_Data *cfdata);
 static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata);
-static int _grab_mouse_down_cb(void *data, int type, void *event);
-static int _grab_mouse_wheel_cb(void *data, int type, void *event);
-static int _grab_key_down_cb(void *data, int type, void *event);
+static Eina_Bool _grab_mouse_down_cb(void *data, int type, void *event);
+static Eina_Bool _grab_mouse_wheel_cb(void *data, int type, void *event);
+static Eina_Bool _grab_key_down_cb(void *data, int type, void *event);
 
 struct _E_Config_Dialog_Data
 {
@@ -1314,8 +1314,8 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata)
    cfdata->locals.dia = NULL;
 }
 
-static int
-_grab_mouse_down_cb(void *data, int type, void *event)
+static Eina_Bool
+_grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event)
 {
    Eina_List *l;
    E_Config_Dialog_Data *cfdata;
@@ -1328,7 +1328,7 @@ _grab_mouse_down_cb(void *data, int type, void *event)
    ev = event;
    cfdata = data;
 
-   if (ev->window != cfdata->locals.bind_win) return 1; 
+   if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
      mod |= E_BINDING_MODIFIER_SHIFT;
@@ -1413,11 +1413,11 @@ _grab_mouse_down_cb(void *data, int type, void *event)
    _update_buttons(cfdata);
    _grab_wnd_hide(cfdata);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_grab_mouse_wheel_cb(void *data, int type, void *event)
+static Eina_Bool
+_grab_mouse_wheel_cb(void *data, __UNUSED__ int type, void *event)
 {
    Eina_List *l;
    E_Config_Binding_Wheel *bw = NULL;
@@ -1429,7 +1429,7 @@ _grab_mouse_wheel_cb(void *data, int type, void *event)
    ev = event;
    cfdata = data;
 
-   if (ev->window != cfdata->locals.bind_win) return 1;
+   if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
      mod |= E_BINDING_MODIFIER_SHIFT;
@@ -1528,18 +1528,18 @@ _grab_mouse_wheel_cb(void *data, int type, void *event)
    _update_buttons(cfdata);
 
    _grab_wnd_hide(cfdata);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_grab_key_down_cb(void *data, int type, void *event)
+static Eina_Bool
+_grab_key_down_cb(void *data, __UNUSED__ int type, void *event)
 {
    E_Config_Dialog_Data *cfdata;
    Ecore_Event_Key *ev = event;
 
    cfdata = data;
 
-   if (ev->window != cfdata->locals.bind_win) return 1;
+   if (ev->window != cfdata->locals.bind_win) return ECORE_CALLBACK_PASS_ON;
 
    if (!strcmp(ev->keyname, "Escape") &&
        !(ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT) &&
@@ -1549,5 +1549,5 @@ _grab_key_down_cb(void *data, int type, void *event)
      { 
 	_grab_wnd_hide(cfdata);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
index 2ab8cfe34..7cbb79502 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
@@ -48,7 +48,7 @@ struct _E_Config_Dialog_Data
 };
 
 static void _import_edj_gen(Import *import);
-static int _import_cb_edje_cc_exit(void *data, int type, void *event);
+static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event);
 static void _import_cb_close(void *data, E_Dialog *dia);
 static void _import_cb_ok(void *data, E_Dialog *dia);
 static void _import_config_save(Import *import);
@@ -352,15 +352,15 @@ _import_edj_gen(Import *import)
    import->exe = ecore_exe_run(cmd, NULL);   
 }
 
-static int
-_import_cb_edje_cc_exit(void *data, int type, void *event)
+static Eina_Bool
+_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event)
 {
    Import *import;
    Ecore_Exe_Event_Del *ev;
   
    ev = event;
    import = data;
-   if (ev->exe != import->exe) return 1;
+   if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->exit_code != 0)
      {
@@ -371,7 +371,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
    e_int_config_wallpaper_update(import->parent, import->fdest);
 
    e_int_config_wallpaper_gradient_del(import->dia);
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 static void 
diff --git a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
index 3bdae7d63..418e8b4dc 100644
--- a/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -73,7 +73,7 @@ struct _E_Config_Dialog_Data
 
 static void _fsel_path_save(FSel *fsel);
 static void _import_edj_gen(Import *import);
-static int _import_cb_edje_cc_exit(void *data, int type, void *event);
+static Eina_Bool _import_cb_edje_cc_exit(void *data, int type, void *event);
 static void _import_cb_delete(E_Win *win);
 static void _import_cb_resize(E_Win *win);
 static void _import_cb_close(void *data, void *data2);
@@ -615,8 +615,8 @@ _import_edj_gen(Import *import)
    import->exe = ecore_exe_run(cmd, NULL);   
 }
 
-static int
-_import_cb_edje_cc_exit(void *data, int type, void *event)
+static Eina_Bool
+_import_cb_edje_cc_exit(void *data, __UNUSED__ int type, void *event)
 {
    Import *import;
    FSel *fsel;
@@ -626,7 +626,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
 
    ev = event;
    import = data;
-   if (ev->exe != import->exe) return 1;
+   if (ev->exe != import->exe) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->exit_code != 0)
      {
@@ -655,7 +655,7 @@ _import_cb_edje_cc_exit(void *data, int type, void *event)
      }
    E_FREE(fdest);
 
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
 static void 
diff --git a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
index e6911a834..ddab0009b 100644
--- a/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper2/e_int_config_wallpaper.c
@@ -127,7 +127,7 @@ static void _item_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _item_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static int _sort_cb(const void *d1, const void *d2);
 
-static int
+static Eina_Bool
 _e_smart_reconfigure_do(void *data)
 {
    Evas_Object *obj = data;
@@ -138,7 +138,7 @@ _e_smart_reconfigure_do(void *data)
    static int recursion = 0;
    Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox, oy, dd;
 
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
    if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
    if (sd->cx < 0) sd->cx = 0;
@@ -415,7 +415,7 @@ _e_smart_reconfigure_do(void *data)
    if (changed)
      evas_object_smart_callback_call(obj, "changed", NULL);
    if (recursion == 0) sd->idle_enter = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -549,7 +549,7 @@ _pan_info_set(Evas_Object *obj, Info *info)
 }
 
 
-static int
+static Eina_Bool
 _sel_anim(void *data)
 {
    Evas_Object *obj = data;
@@ -603,17 +603,17 @@ _sel_anim(void *data)
              sd->selin = EINA_TRUE;
              sd->selout = EINA_FALSE;
              sd->seltime = ecore_loop_time_get();
-             return 1;
+             return ECORE_CALLBACK_RENEW;
           }
         sd->selout = EINA_FALSE;
         sd->selin = EINA_FALSE;
         sd->animator = NULL;
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
-static int
+static Eina_Bool
 _sel_timer(void *data)
 {
    Evas_Object *obj = data;
@@ -625,7 +625,7 @@ _sel_timer(void *data)
         sd->selin = EINA_FALSE;
      }
    sd->seltimer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1025,7 +1025,7 @@ _wp_changed(void *data, Evas_Object *obj, void *event_info)
 
 static void _scan(Info *info);
 
-static int
+static Eina_Bool
 _idler(void *data)
 {
    struct dirent *dp;
@@ -1035,7 +1035,7 @@ _idler(void *data)
    if (!info->dir)
      {
         info->idler = NULL;
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
    dp = readdir(info->dir);
    if (!dp)
@@ -1046,23 +1046,23 @@ _idler(void *data)
         info->dir = NULL;
         info->idler = NULL;
         _scan(info);
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
    if ((!strcmp(dp->d_name, ".")) || (!strcmp(dp->d_name, "..")))
-     return 1;
+     return ECORE_CALLBACK_RENEW;
    if (dp->d_name[0] == '.')
-     return 1;
+     return ECORE_CALLBACK_RENEW;
    snprintf(buf, sizeof(buf), "%s/%s", info->curdir, dp->d_name);
    if (ecore_file_is_dir(buf))
      {
         info->dirs = eina_list_append(info->dirs, strdup(buf));
-        return 1;
+        return ECORE_CALLBACK_RENEW;
      }
    info->scans++;
    _pan_file_add(info->span, buf, 0, 0);
    
    e_util_wakeup();
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index dc8b187f8..b2d06d365 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -856,7 +856,7 @@ _connman_services_reload(E_Connman_Module_Context *ctxt)
    _connman_default_service_changed(ctxt);
 }
 
-static int
+static Eina_Bool
 _connman_default_service_changed_delayed_do(void *data)
 {
    E_Connman_Module_Context *ctxt = data;
@@ -864,7 +864,7 @@ _connman_default_service_changed_delayed_do(void *data)
 
    ctxt->poller.default_service_changed = NULL;
    _connman_default_service_changed(ctxt);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -881,21 +881,21 @@ _connman_default_service_changed_delayed(E_Connman_Module_Context *ctxt)
 
 static void _connman_popup_del(E_Connman_Instance *inst);
 
-static int
+static Eina_Bool
 _connman_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
    E_Connman_Instance *inst = data;
 
    if (ev->window != inst->ui.input.win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    _connman_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _connman_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -903,13 +903,13 @@ _connman_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *e
    const char *keysym;
 
    if (ev->window != inst->ui.input.win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    keysym = ev->key;
    if (strcmp(keysym, "Escape") == 0)
      _connman_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1635,7 +1635,7 @@ _connman_actions_unregister(E_Connman_Module_Context *ctxt)
      }
 }
 
-static int
+static Eina_Bool
 _connman_manager_changed_do(void *data)
 {
    E_Connman_Module_Context *ctxt = data;
@@ -1644,7 +1644,7 @@ _connman_manager_changed_do(void *data)
    _connman_services_reload(ctxt);
 
    ctxt->poller.manager_changed = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1657,7 +1657,7 @@ _connman_manager_changed(void *data, const E_Connman_Element *element __UNUSED__
      (ECORE_POLLER_CORE, 1, _connman_manager_changed_do, ctxt);
 }
 
-static int
+static Eina_Bool
 _connman_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Connman_Module_Context *ctxt = data;
@@ -1671,10 +1671,10 @@ _connman_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED_
 
    _connman_services_reload(ctxt);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _connman_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Connman_Module_Context *ctxt = data;
@@ -1685,16 +1685,16 @@ _connman_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED
    _connman_services_free(ctxt);
    _connman_default_service_changed(ctxt);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _connman_event_mode_changed(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Connman_Module_Context *ctxt = data;
    if ((ctxt->offline_mode == e_config->mode.offline) ||
        (!ctxt->has_manager))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    if (!ctxt->offline_mode_pending)
      {
 	if (!e_connman_manager_offline_mode_set(e_config->mode.offline,
@@ -1704,7 +1704,7 @@ _connman_event_mode_changed(void *data, int type __UNUSED__, void *event __UNUSE
    else
      ctxt->offline_mode_pending = EINA_FALSE;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static E_Config_Dialog *
diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index 629059433..6596edaee 100644
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -39,7 +39,7 @@ static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *e
 static void _menu_cb_post(void *data, E_Menu *m);
 static void _cpufreq_set_governor(const char *governor);
 static void _cpufreq_set_frequency(int frequency);
-static int _cpufreq_cb_check(void *data);
+static Eina_Bool _cpufreq_cb_check(void *data);
 static Status *_cpufreq_status_new();
 static void _cpufreq_status_free(Status *s);
 static int _cpufreq_status_check_available(Status *s);
@@ -49,7 +49,7 @@ static void _cpufreq_face_update_available(Instance *inst);
 static void _cpufreq_face_update_current(Instance *inst);
 static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object *o, const char *emission, const char *source);
 static void _cpufreq_face_cb_set_governor(void *data, Evas_Object *o, const char *emission, const char *source);
-static int _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event);
+static Eina_Bool _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event);
 
 static void _cpufreq_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _cpufreq_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -450,14 +450,14 @@ _cpufreq_set_frequency(int frequency)
      }
 }
 
-static int
+static Eina_Bool
 _cpufreq_cb_check(void *data)
 {
    Instance *inst;
    Eina_List *l;
    int active;
 
-   if (cpufreq_config->menu_poll) return 1;
+   if (cpufreq_config->menu_poll) return ECORE_CALLBACK_RENEW;
    active = cpufreq_config->status->active;
    if (_cpufreq_status_check_current(cpufreq_config->status))
      {
@@ -479,7 +479,7 @@ _cpufreq_cb_check(void *data)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static Status *
@@ -815,7 +815,7 @@ _cpufreq_face_cb_set_governor(void *data, Evas_Object *obj, const char *emission
    if (next_governor != NULL) _cpufreq_set_governor(next_governor);
 }
 
-static int
+static Eina_Bool
 _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
 {
    E_Event_Powersave_Update *ev;
@@ -823,8 +823,8 @@ _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
    Eina_Bool has_powersave = EINA_FALSE;
    Eina_Bool has_conservative = EINA_FALSE;
 
-   if (type != E_EVENT_POWERSAVE_UPDATE) return 1;
-   if (!cpufreq_config->auto_powersave) return 1;
+   if (type != E_EVENT_POWERSAVE_UPDATE) return ECORE_CALLBACK_PASS_ON;
+   if (!cpufreq_config->auto_powersave) return ECORE_CALLBACK_PASS_ON;
 
    ev = event;
    if (!cpufreq_config->status->orig_governor)
@@ -862,7 +862,7 @@ _cpufreq_event_cb_powersave(void *data __UNUSED__, int type, void *event)
 	 break;
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/everything-apps/e_mod_main.c b/src/modules/everything-apps/e_mod_main.c
index e03040fd2..008550292 100644
--- a/src/modules/everything-apps/e_mod_main.c
+++ b/src/modules/everything-apps/e_mod_main.c
@@ -1324,7 +1324,7 @@ e_modapi_save(E_Module *m)
 
 
 /* taken from e_exebuf.c */
-static int
+static Eina_Bool
 _scan_idler(void *data)
 {
    struct stat st;
@@ -1387,7 +1387,7 @@ _scan_idler(void *data)
 	       }
 	  }
 	exe_scan_idler = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    /* no dir is open - open the first path item */
    if (!exe_dir)
@@ -1436,7 +1436,7 @@ _scan_idler(void *data)
 	exe_path = eina_list_remove_list(exe_path, exe_path);
      }
    /* we have mroe scannign to do */
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
diff --git a/src/modules/everything-aspell/e_mod_main.c b/src/modules/everything-aspell/e_mod_main.c
index c0bb79107..0ecbeaf83 100644
--- a/src/modules/everything-aspell/e_mod_main.c
+++ b/src/modules/everything-aspell/e_mod_main.c
@@ -189,7 +189,7 @@ _suggestions_add(Plugin *p, const char *line)
      }
 }
 
-static int
+static Eina_Bool
 _cb_data(void *data, int type __UNUSED__, void *event)
 {
    GET_PLUGIN(p, data);
@@ -198,7 +198,7 @@ _cb_data(void *data, int type __UNUSED__, void *event)
    const char *word;
 
    if (e->exe != p->exe)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    EVRY_PLUGIN_ITEMS_FREE(p);
 
@@ -242,20 +242,20 @@ _cb_data(void *data, int type __UNUSED__, void *event)
    if (p->base.items)
      EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _cb_del(void *data, int type __UNUSED__, void *event)
 {
    Plugin *p = data;
    Ecore_Exe_Event_Del *e = event;
 
    if (e->exe != p->exe)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    p->exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static Evry_Plugin *
diff --git a/src/modules/everything-calc/e_mod_main.c b/src/modules/everything-calc/e_mod_main.c
index 6b86fff4a..162b8527b 100644
--- a/src/modules/everything-calc/e_mod_main.c
+++ b/src/modules/everything-calc/e_mod_main.c
@@ -7,9 +7,9 @@
 #include "evry_api.h"
 // TODO - show error when input not parseable
 
-static int  _cb_data(void *data, int type, void *event);
-static int  _cb_error(void *data, int type, void *event);
-static int  _cb_del(void *data, int type, void *event);
+static Eina_Bool  _cb_data(void *data, int type, void *event);
+static Eina_Bool  _cb_error(void *data, int type, void *event);
+static Eina_Bool  _cb_del(void *data, int type, void *event);
 
 static const Evry_API *evry = NULL;
 static Evry_Module *evry_module = NULL;
@@ -108,8 +108,8 @@ _finish(Evry_Plugin *p)
    active = EINA_FALSE;
 }
 
-static int
-_cb_action_performed(void *data, int type, void *event)
+static Eina_Bool
+_cb_action_performed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Eina_List *l;
    Evry_Item *it, *it2, *it_old;
@@ -117,10 +117,10 @@ _cb_action_performed(void *data, int type, void *event)
    Evry_Plugin *p = _plug;
 
    if (!ev->it1 || !(ev->it1->plugin == p))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (!p->items)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    /* remove duplicates */
    if (p->items->next)
@@ -134,7 +134,7 @@ _cb_action_performed(void *data, int type, void *event)
 		  p->items = eina_list_promote_list(p->items, l);
 		  evry->item_changed(it, 0, 1);
 		  EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
-		  return 1;
+		  return ECORE_CALLBACK_PASS_ON;
 	       }
 	  }
      }
@@ -148,7 +148,7 @@ _cb_action_performed(void *data, int type, void *event)
    evry->item_changed(it2, 0, 1);
    EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int
@@ -178,14 +178,14 @@ _fetch(Evry_Plugin *p, const char *input)
    return 1;
 }
 
-static int
+static Eina_Bool
 _cb_data(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
    Evry_Plugin *p = data;
    Evry_Item *it;
 
-   if (ev->exe != exe) return 1;
+   if (ev->exe != exe) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->lines)
      {
@@ -196,32 +196,32 @@ _cb_data(void *data, int type __UNUSED__, void *event)
 	if (it) evry->item_changed(it, 0, 0);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _cb_error(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Data *ev = event;
 
    if (ev->exe != exe)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    error = 1;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _cb_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Exe_Event_Del *e = event;
 
    if (e->exe != exe)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int
diff --git a/src/modules/everything-windows/e_mod_main.c b/src/modules/everything-windows/e_mod_main.c
index dba522a63..5fd5f9e6e 100644
--- a/src/modules/everything-windows/e_mod_main.c
+++ b/src/modules/everything-windows/e_mod_main.c
@@ -75,8 +75,8 @@ _border_item_add(Plugin *p, E_Border *bd)
    return 1;
 }
 
-static int
-_cb_border_remove(void *data, int type,  void *event)
+static Eina_Bool
+_cb_border_remove(void *data, __UNUSED__ int type,  void *event)
 {
    E_Event_Border_Remove *ev = event;
    Border_Item *bi;
@@ -87,7 +87,7 @@ _cb_border_remove(void *data, int type,  void *event)
      if (bi->border == ev->border)
        break;
 
-   if (!bi) return 1;
+   if (!bi) return ECORE_CALLBACK_PASS_ON;
 
    p->borders = eina_list_remove(p->borders, bi);
    p->base.items = eina_list_remove(p->base.items, bi);
@@ -95,17 +95,17 @@ _cb_border_remove(void *data, int type,  void *event)
 
    EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
-static int
-_cb_border_add(void *data, int type,  void *event)
+static Eina_Bool
+_cb_border_add(void *data, __UNUSED__ int type,  void *event)
 {
    E_Event_Border_Add *ev = event;
    Plugin *p = data;
    int min;
 
    if (!_border_item_add(p, ev->border))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    EVRY_PLUGIN_ITEMS_CLEAR(p);
 
@@ -119,7 +119,7 @@ _cb_border_add(void *data, int type,  void *event)
 	EVRY_PLUGIN_UPDATE(p, EVRY_UPDATE_ADD);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 5b4e1581f..cd7e17016 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -7,12 +7,12 @@
 
 static void _e_mod_action_cb(E_Object *obj, const char *params);
 static void _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev);
-static int  _e_mod_run_defer_cb(void *data);
+static Eina_Bool  _e_mod_run_defer_cb(void *data);
 static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _e_mod_menu_add(void *data, E_Menu *m);
 static void _config_init(void);
 static void _config_free(void);
-static int  _cleanup_history(void *data);
+static Eina_Bool  _cleanup_history(void *data);
 static void _evry_type_init(const char *type);
 
 static Evry_API *_api = NULL;
@@ -234,7 +234,7 @@ e_modapi_save(E_Module *m __UNUSED__)
 /***************************************************************************/
 
 Ecore_Event_Handler *
-evry_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data)
+evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data)
 {
    return ecore_event_handler_add(_evry_events[type], func, data);
 }
@@ -321,18 +321,18 @@ evry_view_unregister(Evry_View *view)
 
 /***************************************************************************/
 
-static int
+static Eina_Bool
 _cleanup_history(void *data)
 {
    /* evrything is active */
    if (evry_hist)
-     return 1;
+     return ECORE_CALLBACK_RENEW;
 
    /* cleanup old entries */
    evry_history_free();
    evry_history_init();
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -496,7 +496,7 @@ _config_free(void)
 static Ecore_Idle_Enterer *_idler = NULL;
 static const char *_params = NULL;
 
-static int
+static Eina_Bool
 _e_mod_run_defer_cb(void *data)
 {
    E_Zone *zone;
@@ -505,7 +505,7 @@ _e_mod_run_defer_cb(void *data)
    if (zone) evry_show(zone, E_ZONE_EDGE_NONE, _params);
 
    _idler = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h
index b27fbc9e0..f5d2d8a22 100644
--- a/src/modules/everything/e_mod_main.h
+++ b/src/modules/everything/e_mod_main.h
@@ -328,7 +328,7 @@ int   evry_view_toggle(Evry_State *s, const char *trigger);
 int evry_gadget_init(void);
 void evry_gadget_shutdown(void);
 
-Ecore_Event_Handler *evry_event_handler_add(int type, int (*func) (void *data, int type, void *event), const void *data);
+Ecore_Event_Handler *evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
 
 extern Evry_History *evry_hist;
 extern Evry_Config  *evry_conf;
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 3b43f4744..cb652c772 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -22,7 +22,7 @@ static int  _evry_backspace(Evry_Selector *sel);
 static void _evry_update(Evry_Selector *sel, int fetch);
 static void _evry_update_text_label(Evry_State *s);
 static int  _evry_clear(Evry_Selector *sel);
-static int  _evry_cb_update_timer(void *data);
+static Eina_Bool  _evry_cb_update_timer(void *data);
 
 static Evry_State *_evry_state_new(Evry_Selector *sel, Eina_List *plugins);
 static void _evry_state_pop(Evry_Selector *sel, int immediate);
@@ -57,9 +57,9 @@ static void _evry_view_hide(Evry_Window *win, Evry_View *v, int slide);
 static void _evry_item_desel(Evry_State *s);
 static void _evry_item_sel(Evry_State *s, Evry_Item *it);
 
-static int  _evry_cb_key_down(void *data, int type, void *event);
-static int  _evry_cb_selection_notify(void *data, int type, void *event);
-static int  _evry_cb_mouse(void *data, int type, void *event);
+static Eina_Bool  _evry_cb_key_down(void *data, int type, void *event);
+static Eina_Bool  _evry_cb_selection_notify(void *data, int type, void *event);
+static Eina_Bool  _evry_cb_mouse(void *data, int type, void *event);
 
 static Eina_List *windows = NULL;
 
@@ -111,15 +111,15 @@ _evry_aggregator_fetch(Evry_State *s)
    return 1;
 }
 
-static int
-_evry_cb_item_changed(void *data, int type, void *event)
+static Eina_Bool
+_evry_cb_item_changed(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Evry_Event_Item_Changed *ev = event;
    Evry_Selector *sel;
    Evry_Item *it = ev->item;
 
    if (!it || !it->plugin || !it->plugin->state)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    sel = it->plugin->state->selector;
 
@@ -128,10 +128,10 @@ _evry_cb_item_changed(void *data, int type, void *event)
 	_evry_selector_update(sel);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _cb_show_timer(void *data)
 {
    Evry_Window *win = data;
@@ -155,10 +155,10 @@ _cb_show_timer(void *data)
 	win->visible = EINA_TRUE;
      }
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _cb_hide_timer(void *data)
 {
    Evry_Window *win = data;
@@ -166,7 +166,7 @@ _cb_hide_timer(void *data)
    win->hide_timer = NULL;
    evry_hide(win, 0);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 Evry_Window *
@@ -527,7 +527,7 @@ _evry_selector_update_actions_do(Evry_Selector *sel)
    return 1;
 }
 
-static int
+static Eina_Bool
 _evry_timer_cb_actions_get(void *data)
 {
    Evry_Selector *sel = data;
@@ -542,7 +542,7 @@ _evry_timer_cb_actions_get(void *data)
 	  _evry_view_show(win, s->view, 0);
      }
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -878,13 +878,13 @@ _evry_cb_drag_finished(E_Drag *drag, int dropped)
 }
 
 #if 0
-static int
-_evry_cb_mouse_in(void *data, int type, void *event)
+static Eina_Bool
+_evry_cb_mouse_in(__UNUSED__ void *data, int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev = event;
 
    if (ev->event_win != input_window)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    e_grabinput_get(input_window, 0, input_window);
 
@@ -894,27 +894,27 @@ _evry_cb_mouse_in(void *data, int type, void *event)
 	win->hide_timer = NULL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_evry_cb_mouse_out(void *data, int type, void *event)
+static Eina_Bool
+_evry_cb_mouse_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Mouse_In *ev = event;
 
    if (!win || (ev->event_win != input_window))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (win->hide_timer)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    win->hide_timer = ecore_timer_add(0.3, _cb_hide_timer, win);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 #endif
 
-static int
+static Eina_Bool
 _evry_cb_mouse(void *data, int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
@@ -924,10 +924,10 @@ _evry_cb_mouse(void *data, int type, void *event)
    ev = event;
 
    if (!win->grab)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (ev->event_window != win->ewin->evas_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    w = win->ewin;
 
@@ -955,11 +955,11 @@ _evry_cb_mouse(void *data, int type, void *event)
 	     GET_FILE(file, s->cur_item);
 
 	     if (!(uri = evry_file_url_get(file)))
-	       return 1;
+	       return ECORE_CALLBACK_PASS_ON;
 
 	     s_len = strlen(uri);
 	     if (!(tmp = realloc(sel, sel_length + s_len + 2 + 1)))
-	       return 1;
+	       return ECORE_CALLBACK_PASS_ON;
 	     sel = tmp;
 	     memcpy(sel + sel_length, uri, s_len);
 	     memcpy(sel + sel_length + s_len, "\r\n", 2);
@@ -975,7 +975,7 @@ _evry_cb_mouse(void *data, int type, void *event)
 	     e_drag_xdnd_start(d, ev->x, ev->y);
 
 	     evry_hide(win, 0);
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
      }
    else if (type == ECORE_EVENT_MOUSE_WHEEL)
@@ -991,7 +991,7 @@ _evry_cb_mouse(void *data, int type, void *event)
 	if (!E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
 	  {
 	     win->mouse_out = 1;
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
 
 	win->mouse_button = ev->buttons;
@@ -1004,11 +1004,11 @@ _evry_cb_mouse(void *data, int type, void *event)
 	    !E_INSIDE(ev->x, ev->y, 0, 0, w->w, w->h))
 	  {
 	     evry_hide(win, 0);
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1910,7 +1910,7 @@ _evry_cheat_history(Evry_State *s, int promote, int delete)
    return 1;
 }
 
-static int
+static Eina_Bool
 _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -1920,12 +1920,12 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
    const char *old;
 
    if (ev->event_window != win->ewin->evas_win)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (!strcmp(ev->key, "Escape"))
      {
 	evry_hide(win, 0);
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 #ifdef DRAG_OFF_WINDOW
    else if (win->grab && !strcmp(ev->key, "F1"))
@@ -1945,7 +1945,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 	e_border_show(ewin->border);
 
 	win->grab = 0;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
 #endif
    else if (ev->modifiers)
@@ -1977,14 +1977,14 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 	       continue;
 
 	     if (win->level > 0)
-	       return 1;
+	       return ECORE_CALLBACK_PASS_ON;
 
 	     if (!(bind->params) &&
 		 (CUR_SEL == OBJ_SEL) &&
 		 ((CUR_SEL)->state && (CUR_SEL)->state->cur_item))
 	       {
 		  _evry_selectors_shift(win, 1);
-		  return 1;
+		  return ECORE_CALLBACK_PASS_ON;
 	       }
 
 	     evry_hide(win, 1);
@@ -2005,7 +2005,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 		    }
 	       }
 
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
      }
 
@@ -2194,7 +2194,7 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
 
  end:
    ev->key = old;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static int
@@ -2266,7 +2266,7 @@ _evry_update(Evry_Selector *sel, int fetch)
      }
 }
 
-static int
+static Eina_Bool
 _evry_cb_update_timer(void *data)
 {
    Evry_Selector *sel = data;
@@ -2276,7 +2276,7 @@ _evry_cb_update_timer(void *data)
    _evry_list_win_update(sel->state);
    sel->update_timer = NULL;
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int
@@ -2517,12 +2517,12 @@ _evry_view_show(Evry_Window *win, Evry_View *v, int slide)
      }
 }
 
-static int
+static Eina_Bool
 _clear_timer(void *data)
 {
    _evry_state_clear(data);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -2970,15 +2970,15 @@ _evry_plugin_list_insert(Evry_State *s, Evry_Plugin *p)
      s->cur_plugins = eina_list_append(s->cur_plugins, p);
 }
 
-static int
+static Eina_Bool
 _evry_cb_selection_notify(void *data, int type, void *event)
 {
    Ecore_X_Event_Selection_Notify *ev;
    Evry_Window *win = data;
    Evry_State *s = (CUR_SEL)->state;
 
-   if (!s || (data != win)) return 1;
-   if (!win->request_selection) return 1;
+   if (!s || (data != win)) return ECORE_CALLBACK_PASS_ON;
+   if (!win->request_selection) return ECORE_CALLBACK_PASS_ON;
 
    win->request_selection = EINA_FALSE;
 
@@ -2997,5 +2997,5 @@ _evry_cb_selection_notify(void *data, int type, void *event)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/everything/evry_api.h b/src/modules/everything/evry_api.h
index 127919bfb..cb9b83cc7 100644
--- a/src/modules/everything/evry_api.h
+++ b/src/modules/everything/evry_api.h
@@ -120,7 +120,7 @@ struct _Evry_API
   History_Types *(*history_types_get)(Evry_Type type);
   int  (*history_item_usage_set)(Evry_Item *it, const char *input, const char *ctxt);
 
-  Ecore_Event_Handler *(*event_handler_add)(int type, int (*func) (void *data, int type, void *event), const void *data);
+  Ecore_Event_Handler *(*event_handler_add)(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);
 
   int log_dom;
 };
diff --git a/src/modules/everything/evry_view.c b/src/modules/everything/evry_view.c
index 333b3c29b..7124b8370 100644
--- a/src/modules/everything/evry_view.c
+++ b/src/modules/everything/evry_view.c
@@ -77,7 +77,7 @@ static View *view = NULL;
 static void _view_clear(Evry_View *view);
 static void _pan_item_select(Evas_Object *obj, Item *it, int scroll);
 static void _animator_del(Evas_Object *obj);
-static int _animator(void *data);
+static Eina_Bool _animator(void *data);
 
 static void
 _thumb_gen(void *data, Evas_Object *obj, void *event_info)
@@ -127,7 +127,7 @@ static int _sort_pos_cb(const void *d1, const void *d2)
    return ((it1->x + it1->y * 4) - (it2->x + it2->y * 4));
 }
 
-static int
+static Eina_Bool
 _thumb_idler(void *data)
 {
    Smart_Data *sd = data;
@@ -191,12 +191,12 @@ _thumb_idler(void *data)
 
 	e_util_wakeup();
 	sd->queue = eina_list_remove_list(sd->queue, l);
-	return 1;
+	return ECORE_CALLBACK_RENEW;
      }
 
    sd->thumb_idler = NULL;
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -338,7 +338,7 @@ _item_hide(Item *it)
    it->visible = EINA_FALSE;
 }
 
-static int
+static Eina_Bool
 _e_smart_reconfigure_do(void *data)
 {
    Evas_Object *obj = data;
@@ -349,7 +349,7 @@ _e_smart_reconfigure_do(void *data)
    Evas_Coord x, y, xx, yy, ww, hh, mw, mh, ox = 0, oy = 0;
    Evas_Coord aspect_w, aspect_h;
 
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
    if (sd->cx > (sd->cw - sd->w)) sd->cx = sd->cw - sd->w;
    if (sd->cy > (sd->ch - sd->h)) sd->cy = sd->ch - sd->h;
    if (sd->cx < 0) sd->cx = 0;
@@ -506,7 +506,7 @@ _e_smart_reconfigure_do(void *data)
 
    sd->idle_enter = NULL;
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -705,11 +705,11 @@ _animator_del(Evas_Object *obj)
    sd->animator = NULL;
 }
 
-static int
+static Eina_Bool
 _animator(void *data)
 {
    Smart_Data *sd = evas_object_smart_data_get(data);
-   if (!sd) return 0;
+   if (!sd) return ECORE_CALLBACK_CANCEL;
 
    double da;
    double spd = ((25.0/ (double)e_config->framerate) /
@@ -735,11 +735,11 @@ _animator(void *data)
      }
 
    if (wait)
-     return 1;
+     return ECORE_CALLBACK_RENEW;
 
    _animator_del(data);
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 
 }
 
@@ -1355,7 +1355,7 @@ _cb_key_down(Evry_View *view, const Ecore_Event_Key *ev)
    return 1;
 }
 
-static int
+static Eina_Bool
 _cb_item_changed(void *data, int type, void *event)
 {
    Evry_Event_Item_Changed *ev = event;
@@ -1363,14 +1363,14 @@ _cb_item_changed(void *data, int type, void *event)
    Eina_List *l;
    Item *it;
    Smart_Data *sd = evas_object_smart_data_get(v->span);
-   if (!sd) return 1;
+   if (!sd) return ECORE_CALLBACK_PASS_ON;
 
    EINA_LIST_FOREACH(sd->items, l, it)
      if (it->item == ev->item)
        break;
 
    if (!it)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (ev->changed_selection)
      {
@@ -1379,7 +1379,7 @@ _cb_item_changed(void *data, int type, void *event)
      }
 
    if (!it->visible)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
 
    edje_object_part_text_set(it->frame, "e.text.label", it->item->label);
 
@@ -1402,7 +1402,7 @@ _cb_item_changed(void *data, int type, void *event)
 	  sd->thumb_idler = ecore_idle_enterer_add(_thumb_idler, sd);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/everything/evry_view_tabs.c b/src/modules/everything/evry_view_tabs.c
index 61f15499d..6de575702 100644
--- a/src/modules/everything/evry_view_tabs.c
+++ b/src/modules/everything/evry_view_tabs.c
@@ -17,7 +17,7 @@ static void _plugin_select(Tab_View *v, Evry_Plugin *p);
 static void _plugin_next(Tab_View *v);
 static void _plugin_prev(Tab_View *v);
 
-static int
+static Eina_Bool
 _timer_cb(void *data)
 {
    Tab_View *v = data;
@@ -25,7 +25,7 @@ _timer_cb(void *data)
    _tabs_update(v);
 
    v->timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 70a872922..bdd4e6e7f 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -125,8 +125,8 @@ static void _e_fwin_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coo
 static void _e_fwin_pan_scroll_update(E_Fwin_Page *page);
 
 static void _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info);
-static int  _e_fwin_zone_move_resize(void *data, int type, void *event);
-static int  _e_fwin_zone_del(void *data, int type, void *event);
+static Eina_Bool  _e_fwin_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool  _e_fwin_zone_del(void *data, int type, void *event);
 static void _e_fwin_config_set(E_Fwin_Page *page);
 static void _e_fwin_window_title_set(E_Fwin_Page *page);
 static void _e_fwin_page_resize(E_Fwin_Page *page);
@@ -135,7 +135,7 @@ static int _e_fwin_dlg_cb_desk_sort(const void *p1, const void *p2);
 static int _e_fwin_dlg_cb_desk_list_sort(const void *data1, const void *data2);
 
 static void _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere);
-static int _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event);
+static Eina_Bool _e_fwin_op_registry_entry_add_cb(void *data, int type, void *event);
 static void _e_fwin_op_registry_entry_iter(E_Fwin_Page *page);
 static void _e_fwin_op_registry_abort_cb(void *data, Evas_Object *obj, const char *emission, const char *source);
 
@@ -1360,17 +1360,17 @@ _e_fwin_zone_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event
    e_fwin_all_unsel(fwin);
 }
 
-static int 
+static Eina_Bool
 _e_fwin_zone_move_resize(void *data, int type, void *event) 
 {
    E_Event_Zone_Move_Resize *ev;
    E_Fwin *fwin;
 
-   if (type != E_EVENT_ZONE_MOVE_RESIZE) return 1;
+   if (type != E_EVENT_ZONE_MOVE_RESIZE) return ECORE_CALLBACK_PASS_ON;
    fwin = data;
    ev = event;
-   if (!fwin) return 1;
-   if (fwin->zone != ev->zone) return 1;
+   if (!fwin) return ECORE_CALLBACK_PASS_ON;
+   if (fwin->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
    if (fwin->bg_obj) 
      {
 	evas_object_move(fwin->bg_obj, ev->zone->x, ev->zone->y);
@@ -1383,22 +1383,22 @@ _e_fwin_zone_move_resize(void *data, int type, void *event)
 	evas_object_move(fwin->cur_page->scrollframe_obj, x, y);
 	evas_object_resize(fwin->cur_page->scrollframe_obj, w, h);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_fwin_zone_del(void *data, int type, void *event) 
 {
    E_Event_Zone_Del *ev;
    E_Fwin *fwin;
 
-   if (type != E_EVENT_ZONE_DEL) return 1;
+   if (type != E_EVENT_ZONE_DEL) return ECORE_CALLBACK_PASS_ON;
    fwin = data;
    ev = event;
-   if (!fwin) return 1;
-   if (fwin->zone != ev->zone) return 1;
+   if (!fwin) return ECORE_CALLBACK_PASS_ON;
+   if (fwin->zone != ev->zone) return ECORE_CALLBACK_PASS_ON;
    e_object_del(E_OBJECT(fwin));
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 
@@ -2216,7 +2216,7 @@ _e_fwin_op_registry_listener_cb(void *data, const E_Fm2_Op_Registry_Entry *ere)
       edje_object_signal_emit(o, "e,action,set,normal", "e");
 }
 
-static int
+static Eina_Bool
 _e_fwin_op_registry_free_data_delayed(void *data)
 {
    evas_object_del((Evas_Object*)data);
@@ -2229,8 +2229,8 @@ _e_fwin_op_registry_free_data(void *data)
    ecore_timer_add(5.0, _e_fwin_op_registry_free_data_delayed, data);
 }
 
-static int
-_e_fwin_op_registry_entry_add_cb(void *data, int type, void *event)
+static Eina_Bool
+_e_fwin_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event)
 {
    E_Fm2_Op_Registry_Entry *ere = (E_Fm2_Op_Registry_Entry *)event;
    E_Fwin_Page *page = data;
diff --git a/src/modules/fileman/e_mod_main.c b/src/modules/fileman/e_mod_main.c
index fa6179461..20236564f 100644
--- a/src/modules/fileman/e_mod_main.c
+++ b/src/modules/fileman/e_mod_main.c
@@ -15,8 +15,8 @@ static void  _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void  _e_mod_menu_add(void *data, E_Menu *m);
 static void  _e_mod_fileman_config_load(void);
 static void  _e_mod_fileman_config_free(void);
-static int   _e_mod_cb_config_timer(void *data);
-static int   _e_mod_zone_add(void *data, int type, void *event);
+static Eina_Bool _e_mod_cb_config_timer(void *data);
+static Eina_Bool _e_mod_zone_add(void *data, int type, void *event);
 
 static E_Module *conf_module = NULL;
 static E_Action *act = NULL;
@@ -517,23 +517,23 @@ _e_mod_fileman_config_free(void)
    E_FREE(fileman_config);   
 }
 
-static int 
-_e_mod_cb_config_timer(void *data) 
+static Eina_Bool
+_e_mod_cb_config_timer(void *data)
 {
    e_util_dialog_show(_("Fileman Settings Updated"), "%s", (char *)data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
-_e_mod_zone_add(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_zone_add(__UNUSED__ void *data, int type, void *event)
 {
    E_Event_Zone_Add *ev;
    E_Zone *zone;
    
-   if (type != E_EVENT_ZONE_ADD) return 1;
+   if (type != E_EVENT_ZONE_ADD) return ECORE_CALLBACK_PASS_ON;
    ev = event;
    zone = ev->zone;
-   if (e_fwin_zone_find(zone)) return 1;
+   if (e_fwin_zone_find(zone)) return ECORE_CALLBACK_PASS_ON;
    if ((zone->container->num == 0) && (zone->num == 0) && 
        (fileman_config->view.show_desktop_icons))
      e_fwin_zone_new(zone, "desktop", "/");
@@ -548,5 +548,5 @@ _e_mod_zone_add(void *data, int type, void *event)
 	     e_fwin_zone_new(zone, "desktop", buf);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/fileman_opinfo/e_mod_main.c b/src/modules/fileman_opinfo/e_mod_main.c
index f5c520a3e..36c37f813 100644
--- a/src/modules/fileman_opinfo/e_mod_main.c
+++ b/src/modules/fileman_opinfo/e_mod_main.c
@@ -36,12 +36,12 @@ static const E_Gadcon_Client_Class _gadcon_class = {
 
 /********************   PROTOS   *******************************************/
 
-static int  _opinfo_op_registry_entry_add_cb     (void *data, int type, void *event);
-static int  _opinfo_op_registry_entry_del_cb     (void *data, int type, void *event);
+static Eina_Bool  _opinfo_op_registry_entry_add_cb     (void *data, int type, void *event);
+static Eina_Bool  _opinfo_op_registry_entry_del_cb     (void *data, int type, void *event);
 static void _opinfo_op_registry_update_all       (Instance *inst);
 static void _opinfo_op_registry_listener         (void *data, const E_Fm2_Op_Registry_Entry *ere);
 static void _opinfo_op_registry_free_data        (void *data);
-static int  _opinfo_op_registry_free_data_delayed(void *data);
+static Eina_Bool  _opinfo_op_registry_free_data_delayed(void *data);
 static void _opinfo_op_registry_abort_cb         (void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _opinfo_op_registry_summary_cb       (void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _opinfo_op_registry_detailed_cb      (void *data, Evas_Object *obj, const char *emission, const char *source);
@@ -170,7 +170,7 @@ _opinfo_op_registry_free_data(void *data)
    ecore_timer_add(5.0, _opinfo_op_registry_free_data_delayed, data);
 }
 
-static int 
+static Eina_Bool
 _opinfo_op_registry_free_data_delayed(void *data)
 {
    Evas_Object *o = data;
@@ -251,8 +251,8 @@ _opinfo_op_registry_window_jump_cb(void *data, Evas_Object *obj, const char *emi
       e_border_pointer_warp_to_center(win->border);
 }
 
-static int
-_opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
+static Eina_Bool
+_opinfo_op_registry_entry_add_cb(void *data, __UNUSED__ int type, void *event)
 {
    E_Fm2_Op_Registry_Entry *ere = event;
    Instance *inst = data;
@@ -290,8 +290,8 @@ _opinfo_op_registry_entry_add_cb(void *data, int type, void *event)
    return ECORE_CALLBACK_RENEW;
 }
 
-static int
-_opinfo_op_registry_entry_del_cb(void *data, int type, void *event)
+static Eina_Bool
+_opinfo_op_registry_entry_del_cb(void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    Instance *inst = data;
    
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 44b653f0c..ec9eda471 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -112,7 +112,7 @@ static void _ibar_inst_cb_leave(void *data, const char *type, void *event_info);
 static void _ibar_inst_cb_drop(void *data, const char *type, void *event_info);
 static void _ibar_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y);
 static void _ibar_inst_cb_scroll(void *data);
-static int  _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev);
+static Eina_Bool  _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev);
 
 static E_Config_DD *conf_edd = NULL;
 static E_Config_DD *conf_item_edd = NULL;
@@ -1329,8 +1329,8 @@ e_modapi_save(E_Module *m)
    return 1;
 }
 
-static int
-_ibar_cb_config_icon_theme(void *data, int ev_type, void *ev)
+static Eina_Bool
+_ibar_cb_config_icon_theme(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *ev)
 {
    const Eina_List *l;
    Instance *inst;
@@ -1343,5 +1343,5 @@ _ibar_cb_config_icon_theme(void *data, int ev_type, void *ev)
 	EINA_LIST_FOREACH(inst->ibar->icons, l2, icon)
 	  _ibar_icon_fill(icon);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/ibox/e_mod_main.c b/src/modules/ibox/e_mod_main.c
index 308ced8dc..af0948982 100644
--- a/src/modules/ibox/e_mod_main.c
+++ b/src/modules/ibox/e_mod_main.c
@@ -106,14 +106,14 @@ static void _ibox_inst_cb_leave(void *data, const char *type, void *event_info);
 static void _ibox_inst_cb_drop(void *data, const char *type, void *event_info);
 static void _ibox_drop_position_update(Instance *inst, Evas_Coord x, Evas_Coord y);
 static void _ibox_inst_cb_scroll(void *data);
-static int _ibox_cb_event_border_add(void *data, int type, void *event);
-static int _ibox_cb_event_border_remove(void *data, int type, void *event);
-static int _ibox_cb_event_border_iconify(void *data, int type, void *event);
-static int _ibox_cb_event_border_uniconify(void *data, int type, void *event);
-static int _ibox_cb_event_border_icon_change(void *data, int type, void *event);
-static int _ibox_cb_event_border_urgent_change(void *data, int type, void *event);
-static int _ibox_cb_event_border_zone_set(void *data, int type, void *event);
-static int _ibox_cb_event_desk_show(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_add(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_remove(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_iconify(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_uniconify(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_icon_change(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_urgent_change(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_border_zone_set(void *data, int type, void *event);
+static Eina_Bool _ibox_cb_event_desk_show(void *data, int type, void *event);
 static Config_Item *_ibox_config_item_get(const char *id);
 
 static E_Config_DD *conf_edd = NULL;
@@ -1020,8 +1020,8 @@ _ibox_inst_cb_drop(void *data, const char *type, void *event_info)
    _gc_orient(inst->gcc, -1);
 }
 
-static int
-_ibox_cb_event_border_add(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev;
    IBox *b;
@@ -1052,11 +1052,11 @@ _ibox_cb_event_border_add(void *data, int type, void *event)
 	while (ibox)
 	  ibox = eina_list_remove_list(ibox, ibox);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_remove(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_remove(__UNUSED__ void *data, int type, void *event)
 {
    E_Event_Border_Remove *ev;
    IBox *b;
@@ -1080,11 +1080,11 @@ _ibox_cb_event_border_remove(void *data, int type, void *event)
    while (ibox)
      ibox = eina_list_remove_list(ibox, ibox);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_iconify(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_iconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Iconify *ev;
    IBox *b;
@@ -1113,11 +1113,11 @@ _ibox_cb_event_border_iconify(void *data, int type, void *event)
 
    while (ibox)
      ibox = eina_list_remove_list(ibox, ibox);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_uniconify(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Uniconify *ev;
    IBox *b;
@@ -1143,11 +1143,11 @@ _ibox_cb_event_border_uniconify(void *data, int type, void *event)
    while (ibox)
      ibox = eina_list_remove_list(ibox, ibox);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_icon_change(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_icon_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Icon_Change *ev;
    IBox *b;
@@ -1169,11 +1169,11 @@ _ibox_cb_event_border_icon_change(void *data, int type, void *event)
    while (ibox)
      ibox = eina_list_remove_list(ibox, ibox);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_urgent_change(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Urgent_Change *ev;
    IBox *b;
@@ -1201,11 +1201,11 @@ _ibox_cb_event_border_urgent_change(void *data, int type, void *event)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_ibox_cb_event_border_zone_set(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_border_zone_set(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Zone_Set *ev;
 
@@ -1217,8 +1217,8 @@ _ibox_cb_event_border_zone_set(void *data, int type, void *event)
    return 1;
 }
 
-static int
-_ibox_cb_event_desk_show(void *data, int type, void *event)
+static Eina_Bool
+_ibox_cb_event_desk_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Desk_Show *ev;
    IBox *b;
@@ -1242,7 +1242,7 @@ _ibox_cb_event_desk_show(void *data, int type, void *event)
    while (ibox)
      ibox = eina_list_remove_list(ibox, ibox);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static Config_Item *
diff --git a/src/modules/illume-bluetooth/e_mod_main.c b/src/modules/illume-bluetooth/e_mod_main.c
index c359ae5e1..c75f231d0 100644
--- a/src/modules/illume-bluetooth/e_mod_main.c
+++ b/src/modules/illume-bluetooth/e_mod_main.c
@@ -17,7 +17,7 @@ static void _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
 static char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
-static int _cb_poll(void *data);
+static Eina_Bool _cb_poll(void *data);
 static int _get_interface_class(int iclass);
 
 /* local variables */
@@ -118,7 +118,7 @@ _gc_id_new(E_Gadcon_Client_Class *cc)
    return buff;
 }
 
-static int 
+static Eina_Bool
 _cb_poll(void *data) 
 {
    Instance *inst;
@@ -134,7 +134,7 @@ _cb_poll(void *data)
         else
           edje_object_signal_emit(inst->obj, "e,state,passive", "e");
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static int 
diff --git a/src/modules/illume-home/e_mod_config.c b/src/modules/illume-home/e_mod_config.c
index f78f4b278..836372398 100644
--- a/src/modules/illume-home/e_mod_config.c
+++ b/src/modules/illume-home/e_mod_config.c
@@ -8,7 +8,7 @@ static void _il_home_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfd
 static Evas_Object *_il_home_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _il_home_config_changed(void *data, Evas_Object *obj, void *event);
 static void _il_home_config_click_changed(void *data, Evas_Object *obj, void *event);
-static int _il_home_config_change_timeout(void *data);
+static Eina_Bool _il_home_config_change_timeout(void *data);
 
 /* local variables */
 EAPI Il_Home_Config *il_home_cfg = NULL;
@@ -194,11 +194,11 @@ _il_home_config_click_changed(void *data, Evas_Object *obj, void *event)
    _il_home_config_changed(data, obj, event);
 }
 
-static int 
+static Eina_Bool
 _il_home_config_change_timeout(void *data) 
 {
    il_home_win_cfg_update();
    e_config_save_queue();
    _il_home_config_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/illume-home/e_mod_main.c b/src/modules/illume-home/e_mod_main.c
index 9254c455c..3d6e94a8c 100644
--- a/src/modules/illume-home/e_mod_main.c
+++ b/src/modules/illume-home/e_mod_main.c
@@ -42,20 +42,20 @@ static void _il_home_win_new(E_Zone *zone);
 static void _il_home_win_cb_free(Il_Home_Win *hwin);
 static void _il_home_win_cb_resize(E_Win *win);
 static void _il_home_fmc_set(Evas_Object *obj);
-static int _il_home_update_deferred(void *data __UNUSED__);
+static Eina_Bool _il_home_update_deferred(void *data __UNUSED__);
 static void _il_home_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
 static void _il_home_pan_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
 static void _il_home_pan_max_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
 static void _il_home_pan_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 static void _il_home_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__);
-static int _il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
-static int _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _il_home_cb_exe_timeout(void *data);
-static int _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _il_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__);
+static Eina_Bool _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_cb_exe_timeout(void *data);
+static Eina_Bool _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _il_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event);
 
 /* local variables */
 static Eina_List *hwins = NULL;
@@ -508,13 +508,13 @@ _il_home_fmc_set(Evas_Object *obj)
    e_fm2_config_set(obj, &fmc);
 }
 
-static int 
+static Eina_Bool
 _il_home_update_deferred(void *data __UNUSED__) 
 {
    _il_home_apps_unpopulate();
    _il_home_apps_populate();
    defer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
@@ -560,15 +560,15 @@ _il_home_cb_selected(void *data, Evas_Object *obj __UNUSED__, void *event __UNUS
      }
 }
 
-static int 
+static Eina_Bool
 _il_home_desktop_cache_update(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__) 
 {
    if (defer) ecore_timer_del(defer);
    defer = ecore_timer_add(0.5, _il_home_update_deferred, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Add *ev;
@@ -603,10 +603,10 @@ _il_home_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event)
         if (exe->timeout) ecore_timer_del(exe->timeout);
         exe->timeout = NULL;
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Remove *ev;
@@ -628,10 +628,10 @@ _il_home_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event)
              break;
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Il_Home_Exec *exe;
@@ -655,15 +655,15 @@ _il_home_cb_exe_del(void *data __UNUSED__, int type __UNUSED__, void *event)
              break;
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_exe_timeout(void *data) 
 {
    Il_Home_Exec *exe;
 
-   if (!(exe = data)) return 1;
+   if (!(exe = data)) return ECORE_CALLBACK_CANCEL;
    if (exe->handle) e_busycover_pop(exe->cover, exe->handle);
    exe->handle = NULL;
    if (!exe->border) 
@@ -671,13 +671,13 @@ _il_home_cb_exe_timeout(void *data)
         exes = eina_list_remove(exes, exe);
         if (exe->desktop) efreet_desktop_free(exe->desktop);
         E_FREE(exe);
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
    exe->timeout = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Client_Message *ev;
@@ -688,7 +688,7 @@ _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *eve
         E_Zone *zone;
 
         zone = e_util_zone_window_find(ev->win);
-        if (zone->black_win != ev->win) return 1;
+        if (zone->black_win != ev->win) return ECORE_CALLBACK_PASS_ON;
         _il_home_win_new(zone);
      }
    else if (ev->message_type == ECORE_X_ATOM_E_ILLUME_HOME_DEL) 
@@ -697,7 +697,7 @@ _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *eve
         Eina_List *l;
         Il_Home_Win *hwin;
 
-        if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
+        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
         EINA_LIST_FOREACH(hwins, l, hwin) 
           {
              if (hwin->win->border == bd) 
@@ -708,10 +708,10 @@ _il_home_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *eve
                }
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Window_Property *ev;
@@ -719,7 +719,7 @@ _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event)
    Eina_List *l;
 
    ev = event;
-   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return 1;
+   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return ECORE_CALLBACK_PASS_ON;
    EINA_LIST_FOREACH(hwins, l, hwin) 
      if (hwin->o_fm) 
        {
@@ -727,16 +727,16 @@ _il_home_cb_prop_change(void *data __UNUSED__, int type __UNUSED__, void *event)
           e_fm2_refresh(hwin->o_fm);
        }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _il_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Il_Home_Win *hwin;
    Eina_List *l;
 
-   if (type != E_EVENT_BG_UPDATE) return 1;
+   if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
 
    EINA_LIST_FOREACH(hwins, l, hwin) 
      {
@@ -753,5 +753,5 @@ _il_home_cb_bg_change(void *data __UNUSED__, int type __UNUSED__, void *event)
 	edje_object_file_set(hwin->o_bg, bgfile, "e/desktop/background");
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume-indicator/e_mod_ind_win.c b/src/modules/illume-indicator/e_mod_ind_win.c
index c14f106cc..c11853976 100644
--- a/src/modules/illume-indicator/e_mod_ind_win.c
+++ b/src/modules/illume-indicator/e_mod_ind_win.c
@@ -5,8 +5,8 @@
 
 /* local function prototypes */
 static void _e_mod_ind_win_cb_free(Ind_Win *iwin);
-static int _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event);
-static int _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event);
 static void _e_mod_ind_win_cb_resize(E_Win *win);
 static void _e_mod_ind_win_cb_mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event);
 static void _e_mod_ind_win_cb_mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void *event);
@@ -180,7 +180,7 @@ _e_mod_ind_win_cb_free(Ind_Win *iwin)
    E_FREE(iwin);
 }
 
-static int 
+static Eina_Bool
 _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event) 
 {
    Ind_Win *iwin;
@@ -188,9 +188,9 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
 
    ev = event;
 
-   if (!(iwin = data)) return 1;
-   if (ev->win != iwin->win->container->manager->root) return 1;
-   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return 1;
+   if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->win != iwin->win->container->manager->root) return ECORE_CALLBACK_PASS_ON;
+   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return ECORE_CALLBACK_PASS_ON;
 
    /* set minimum size of this window */
    e_win_size_min_set(iwin->win, iwin->zone->w, (il_ind_cfg->height * e_scale));
@@ -208,23 +208,23 @@ _e_mod_ind_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
                                            iwin->win->x, iwin->win->y, 
                                            iwin->win->w, (il_ind_cfg->height * e_scale));
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_ind_win_cb_zone_resize(void *data, int type __UNUSED__, void *event) 
 {
    Ind_Win *iwin;
    E_Event_Zone_Move_Resize *ev;
 
    ev = event;
-   if (!(iwin = data)) return 1;
-   if (ev->zone != iwin->zone) return 1;
+   if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->zone != iwin->zone) return ECORE_CALLBACK_PASS_ON;
 
    /* set minimum size of this window to match zone size */
    e_win_size_min_set(iwin->win, ev->zone->w, (il_ind_cfg->height * e_scale));
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume-kbd-toggle/e_mod_main.c b/src/modules/illume-kbd-toggle/e_mod_main.c
index 67e8a7fdb..c64a3ac15 100644
--- a/src/modules/illume-kbd-toggle/e_mod_main.c
+++ b/src/modules/illume-kbd-toggle/e_mod_main.c
@@ -18,9 +18,9 @@ static char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static void _cb_btn_click(void *data, void *data2);
-static int _cb_border_focus_in(void *data, int type __UNUSED__, void *event);
-static int _cb_border_remove(void *data, int type __UNUSED__, void *event);
-static int _cb_border_property(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _cb_border_focus_in(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _cb_border_remove(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _cb_border_property(void *data, int type __UNUSED__, void *event);
 static void _set_btn_icon(Evas_Object *obj, Ecore_X_Virtual_Keyboard_State state);
 
 /* local variables */
@@ -160,33 +160,33 @@ _cb_btn_click(void *data, void *data2)
                                           ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF);
 }
 
-static int 
+static Eina_Bool
 _cb_border_focus_in(void *data, int type __UNUSED__, void *event) 
 {
    Instance *inst;
    E_Event_Border_Focus_In *ev;
    E_Border *bd;
 
-   if (!(inst = data)) return 1;
+   if (!(inst = data)) return ECORE_CALLBACK_PASS_ON;
    ev = event;
-   if (ev->border->stolen) return 1;
-   if (!(bd = ev->border)) return 1;
-   if (bd->zone != inst->gcc->gadcon->zone) return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON;
+   if (!(bd = ev->border)) return ECORE_CALLBACK_PASS_ON;
+   if (bd->zone != inst->gcc->gadcon->zone) return ECORE_CALLBACK_PASS_ON;
    _set_btn_icon(inst->o_btn, bd->client.vkbd.state);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _cb_border_remove(void *data, int type __UNUSED__, void *event) 
 {
    Instance *inst;
 
-   if (!(inst = data)) return 1;
+   if (!(inst = data)) return ECORE_CALLBACK_PASS_ON;
    _set_btn_icon(inst->o_btn, ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _cb_border_property(void *data, int type __UNUSED__, void *event) 
 {
    Instance *inst;
@@ -194,13 +194,13 @@ _cb_border_property(void *data, int type __UNUSED__, void *event)
    E_Border *bd;
 
    ev = event;
-   if (ev->atom != ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) return 1;
-   if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
-   if (!bd->focused) return 1;
-   if (!(inst = data)) return 1;
-   if (bd->zone != inst->gcc->gadcon->zone) return 1;
+   if (ev->atom != ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) return ECORE_CALLBACK_PASS_ON;
+   if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
+   if (!bd->focused) return ECORE_CALLBACK_PASS_ON;
+   if (!(inst = data)) return ECORE_CALLBACK_PASS_ON;
+   if (bd->zone != inst->gcc->gadcon->zone) return ECORE_CALLBACK_PASS_ON;
    _set_btn_icon(inst->o_btn, bd->client.vkbd.state);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume-keyboard/e_kbd_buf.c b/src/modules/illume-keyboard/e_kbd_buf.c
index 61cfa236d..dfe54b03e 100644
--- a/src/modules/illume-keyboard/e_kbd_buf.c
+++ b/src/modules/illume-keyboard/e_kbd_buf.c
@@ -219,7 +219,7 @@ _e_kbd_buf_matches_update(E_Kbd_Buf *kb)
      }
 }
 
-static int
+static Eina_Bool
 _e_kbd_buf_cb_data_dict_reload(void *data)
 {
    E_Kbd_Buf *kb;
@@ -231,7 +231,7 @@ _e_kbd_buf_cb_data_dict_reload(void *data)
    if (kb->dict.data) e_kbd_dict_free(kb->dict.data);
    e_user_dir_concat_static(buf, "dicts-dynamic/data.dic");
    kb->dict.data = e_kbd_dict_new(buf);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -535,7 +535,7 @@ e_kbd_buf_word_use(E_Kbd_Buf *kb, const char *word)
 }
 
 // FIXME: just faking delayed lookup with timer
-static int
+static Eina_Bool
 _e_kbd_buf_cb_faket(void *data)
 {
    E_Kbd_Buf *kb;
@@ -545,7 +545,7 @@ _e_kbd_buf_cb_faket(void *data)
    kb->lookup.func((void *)kb->lookup.data);
    kb->lookup.func = NULL;
    kb->lookup.data = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 EAPI void
diff --git a/src/modules/illume-keyboard/e_kbd_int.c b/src/modules/illume-keyboard/e_kbd_int.c
index dbce325e2..6154e1468 100644
--- a/src/modules/illume-keyboard/e_kbd_int.c
+++ b/src/modules/illume-keyboard/e_kbd_int.c
@@ -20,7 +20,7 @@ static void _e_kbd_int_zoomkey_down(E_Kbd_Int *ki);
 static void _e_kbd_int_matches_update(void *data);
 static void _e_kbd_int_dictlist_down(E_Kbd_Int *ki);
 static void _e_kbd_int_matchlist_down(E_Kbd_Int *ki);
-static int _e_kbd_int_cb_border_move(void *data, int type, void *event);
+static Eina_Bool _e_kbd_int_cb_border_move(void *data, int type, void *event);
 
 static void
 _e_kbd_int_cb_resize(E_Win *win)
@@ -644,7 +644,7 @@ _e_kbd_int_zoomkey_update(E_Kbd_Int *ki)
      }
 }
 
-static int
+static Eina_Bool
 _e_kbd_int_cb_hold_timeout(void *data)
 {
    E_Kbd_Int *ki;
@@ -661,7 +661,7 @@ _e_kbd_int_cb_hold_timeout(void *data)
      }
    _e_kbd_int_zoomkey_up(ki);
    _e_kbd_int_zoomkey_update(ki);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1283,8 +1283,8 @@ _e_kbd_int_layout_next(E_Kbd_Int *ki)
    _e_kbd_int_layout_select(ki, kil);
 }
 
-static int
-_e_kbd_int_cb_client_message(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Client_Message *ev;
    E_Kbd_Int *ki;
@@ -1335,7 +1335,7 @@ _e_kbd_int_cb_client_message(void *data, int type, void *event)
 
         if (kil) _e_kbd_int_layout_select(ki, kil);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1768,17 +1768,17 @@ _theme_obj_new(Evas *e, const char *custom_dir, const char *group)
    return o;
 }
 
-static int 
+static Eina_Bool
 _e_kbd_int_cb_border_move(void *data, int type, void *event) 
 {
    E_Event_Border_Move *ev;
    E_Kbd_Int *ki;
 
    ev = event;
-   if (!(ki = data)) return 1;
-   if (ki->win->border != ev->border) return 1;
+   if (!(ki = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ki->win->border != ev->border) return ECORE_CALLBACK_PASS_ON;
    _e_kbd_int_zoomkey_down(ki);
    _e_kbd_int_matchlist_down(ki);
    _e_kbd_int_dictlist_down(ki);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c
index dfa43fa23..2c5ffb580 100644
--- a/src/modules/illume-keyboard/e_mod_config.c
+++ b/src/modules/illume-keyboard/e_mod_config.c
@@ -7,7 +7,7 @@ static void *_il_kbd_config_create(E_Config_Dialog *cfd);
 static void _il_kbd_config_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _il_kbd_config_changed(void *data, Evas_Object *obj, void *event);
-static int _il_kbd_config_change_timeout(void *data);
+static Eina_Bool _il_kbd_config_change_timeout(void *data);
 
 EAPI Il_Kbd_Config *il_kbd_cfg = NULL;
 static E_Config_DD *conf_edd = NULL;
@@ -206,8 +206,8 @@ _il_kbd_config_changed(void *data, Evas_Object *obj, void *event)
      ecore_timer_add(0.5, _il_kbd_config_change_timeout, data);
 }
 
-static int 
-_il_kbd_config_change_timeout(void *data) 
+static Eina_Bool
+_il_kbd_config_change_timeout(__UNUSED__ void *data)
 {
    Eina_List *l;
 
@@ -250,5 +250,5 @@ _il_kbd_config_change_timeout(void *data)
    il_kbd_cfg_update();
    e_config_save_queue();
    _il_kbd_config_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c
index 368ed7c74..69b200337 100644
--- a/src/modules/illume-keyboard/e_mod_main.c
+++ b/src/modules/illume-keyboard/e_mod_main.c
@@ -6,7 +6,7 @@
 /* local function prototypes */
 static void _il_kbd_stop(void);
 static void _il_kbd_start(void);
-static int _il_kbd_cb_exit(void *data, int type, void *event);
+static Eina_Bool _il_kbd_cb_exit(void *data, int type, void *event);
 
 /* local variables */
 static E_Kbd_Int *ki = NULL;
@@ -114,12 +114,12 @@ _il_kbd_start(void)
      }
 }
 
-static int 
+static Eina_Bool
 _il_kbd_cb_exit(void *data, int type, void *event) 
 {
    Ecore_Exe_Event_Del *ev;
 
    ev = event;
    if (ev->exe == _kbd_exe) _kbd_exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume-mode-toggle/e_mod_main.c b/src/modules/illume-mode-toggle/e_mod_main.c
index ab6fed756..6e8391279 100644
--- a/src/modules/illume-mode-toggle/e_mod_main.c
+++ b/src/modules/illume-mode-toggle/e_mod_main.c
@@ -18,7 +18,7 @@ static char *_gc_label(E_Gadcon_Client_Class *cc);
 static Evas_Object *_gc_icon(E_Gadcon_Client_Class *cc, Evas *evas);
 static const char *_gc_id_new(E_Gadcon_Client_Class *cc);
 static void _cb_btn_click(void *data, void *data2);
-static int _cb_event_client_message(void *data, int type, void *event);
+static Eina_Bool _cb_event_client_message(void *data, int type, void *event);
 static void _set_icon(Instance *inst);
 
 /* local variables */
@@ -147,17 +147,17 @@ _cb_btn_click(void *data, void *data2)
    ecore_x_e_illume_mode_send(xwin, mode);
 }
 
-static int 
-_cb_event_client_message(void *data, int type, void *event) 
+static Eina_Bool
+_cb_event_client_message(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Client_Message *ev;
    Instance *inst;
 
    ev = event;
-   if (ev->message_type != ECORE_X_ATOM_E_ILLUME_MODE) return 1;
-   if (!(inst = data)) return 1;
+   if (ev->message_type != ECORE_X_ATOM_E_ILLUME_MODE) return ECORE_CALLBACK_PASS_ON;
+   if (!(inst = data)) return ECORE_CALLBACK_PASS_ON;
    _set_icon(inst);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume-softkey/e_mod_sft_win.c b/src/modules/illume-softkey/e_mod_sft_win.c
index 610453598..60f23d66e 100644
--- a/src/modules/illume-softkey/e_mod_sft_win.c
+++ b/src/modules/illume-softkey/e_mod_sft_win.c
@@ -5,8 +5,8 @@
 
 /* local function prototypes */
 static void _e_mod_sft_win_cb_free(Sft_Win *swin);
-static int _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event);
-static int _e_mod_sft_win_cb_zone_resize(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_sft_win_cb_zone_resize(void *data, int type __UNUSED__, void *event);
 static void _e_mod_sft_win_cb_resize(E_Win *win);
 static void _e_mod_sft_win_create_default_buttons(Sft_Win *swin);
 static void _e_mod_sft_win_cb_close(void *data, void *data2 __UNUSED__);
@@ -150,7 +150,7 @@ _e_mod_sft_win_cb_free(Sft_Win *swin)
    E_FREE(swin);
 }
 
-static int 
+static Eina_Bool
 _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event) 
 {
    Sft_Win *swin;
@@ -158,9 +158,9 @@ _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
 
    ev = event;
 
-   if (!(swin = data)) return 1;
-   if (ev->win != swin->win->container->manager->root) return 1;
-   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return 1;
+   if (!(swin = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->win != swin->win->container->manager->root) return ECORE_CALLBACK_PASS_ON;
+   if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return ECORE_CALLBACK_PASS_ON;
 
    /* set minimum size of this window */
    e_win_size_min_set(swin->win, swin->zone->w, (il_sft_cfg->height * e_scale));
@@ -177,23 +177,23 @@ _e_mod_sft_win_cb_win_prop(void *data, int type __UNUSED__, void *event)
    ecore_x_e_illume_softkey_geometry_set(swin->zone->black_win, 
                                          swin->win->x, swin->win->y, 
                                          swin->win->w, (il_sft_cfg->height * e_scale));
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_sft_win_cb_zone_resize(void *data, int type __UNUSED__, void *event) 
 {
    Sft_Win *swin;
    E_Event_Zone_Move_Resize *ev;
 
    ev = event;
-   if (!(swin = data)) return 1;
-   if (ev->zone != swin->zone) return 1;
+   if (!(swin = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->zone != swin->zone) return ECORE_CALLBACK_PASS_ON;
 
    /* set minimum size of this window */
    e_win_size_min_set(swin->win, ev->zone->w, (il_sft_cfg->height * e_scale));
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume/e_appwin.c b/src/modules/illume/e_appwin.c
index 136a2a44d..c9930e721 100644
--- a/src/modules/illume/e_appwin.c
+++ b/src/modules/illume/e_appwin.c
@@ -28,11 +28,11 @@ EAPI int E_EVENT_APPWIN_DEL = 0;
 
 E_Appwin *_e_appwin_new(E_Zone *zone, const char *themedir);
 static void _e_appwin_free(E_Appwin *ess);
-static int _e_appwin_cb_animate(void *data);
+static Eina_Bool _e_appwin_cb_animate(void *data);
 static void _e_appwin_slide(E_Appwin *ess, int out, double len);
-static int _e_appwin_cb_mouse_up(void *data, int type, void *event);
-static int _e_appwin_cb_zone_move_resize(void *data, int type, void *event);
-static int _e_appwin_cb_zone_del(void *data, int type, void *event);
+static Eina_Bool _e_appwin_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_appwin_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_appwin_cb_zone_del(void *data, int type, void *event);
 static void _e_appwin_event_simple_free(void *data, void *ev);
 static void _e_appwin_object_del_attach(void *o);
 static void _e_appwin_cb_item_sel(void *data);
@@ -235,7 +235,7 @@ _e_appwin_free(E_Appwin *esw)
    free(esw);
 }
 
-static int
+static Eina_Bool
 _e_appwin_cb_animate(void *data)
 {
    E_Appwin *esw;
@@ -274,9 +274,9 @@ _e_appwin_cb_animate(void *data)
 	     e_widget_ilist_clear(esw->ilist_obj);
 	     e_widget_ilist_thaw(esw->ilist_obj);
 	  }
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -310,8 +310,8 @@ _e_appwin_slide(E_Appwin *esw, int out, double len)
      }
 }
 
-static int
-_e_appwin_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_appwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Appwin *esw;
@@ -323,11 +323,11 @@ _e_appwin_cb_mouse_up(void *data, int type, void *event)
 	if (esw->out) _e_appwin_slide(esw, 0, 1.0);
 	else _e_appwin_slide(esw, 1, 1.0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_appwin_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_appwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    E_Appwin *esw;
@@ -338,11 +338,11 @@ _e_appwin_cb_zone_move_resize(void *data, int type, void *event)
      {
 	/* FIXME: handle new size pants */
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_appwin_cb_zone_del(void *data, int type, void *event)
+static Eina_Bool
+_e_appwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Del *ev;
    E_Appwin *esw;
@@ -353,7 +353,7 @@ _e_appwin_cb_zone_del(void *data, int type, void *event)
      {
 	e_object_del(E_OBJECT(esw));
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 				       
 static void
diff --git a/src/modules/illume/e_busycover.c b/src/modules/illume/e_busycover.c
index 00ecc2f3c..f5e8ee7e6 100644
--- a/src/modules/illume/e_busycover.c
+++ b/src/modules/illume/e_busycover.c
@@ -10,7 +10,7 @@
 
 E_Busycover *_e_busycover_new(E_Zone *zone, const char *themedir);
 static void _e_busycover_free(E_Busycover *esw);
-static int _e_busycover_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_busycover_cb_zone_move_resize(void *data, int type, void *event);
 static void _e_busycover_cb_item_sel(void *data, void *data2);
 
 static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@@ -125,7 +125,7 @@ _e_busycover_free(E_Busycover *esw)
    free(esw);
 }
 
-static int
+static Eina_Bool
 _e_busycover_cb_zone_move_resize(void *data, int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
@@ -141,7 +141,7 @@ _e_busycover_cb_zone_move_resize(void *data, int type, void *event)
 	evas_object_move(esw->base_obj, x, y);
 	evas_object_resize(esw->base_obj, w, h);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 
diff --git a/src/modules/illume/e_busywin.c b/src/modules/illume/e_busywin.c
index 32d8b757a..b07e3ae27 100644
--- a/src/modules/illume/e_busywin.c
+++ b/src/modules/illume/e_busywin.c
@@ -6,10 +6,10 @@
 
 E_Busywin *_e_busywin_new(E_Zone *zone, const char *themedir);
 static void _e_busywin_free(E_Busywin *esw);
-static int _e_busywin_cb_animate(void *data);
+static Eina_Bool _e_busywin_cb_animate(void *data);
 static void _e_busywin_slide(E_Busywin *esw, int out, double len);
-static int _e_busywin_cb_mouse_up(void *data, int type, void *event);
-static int _e_busywin_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_busywin_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_busywin_cb_zone_move_resize(void *data, int type, void *event);
 static void _e_busywin_cb_item_sel(void *data, void *data2);
 
 static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
@@ -145,7 +145,7 @@ _e_busywin_free(E_Busywin *esw)
    free(esw);
 }
 
-static int
+static Eina_Bool
 _e_busywin_cb_animate(void *data)
 {
    E_Busywin *esw;
@@ -177,9 +177,9 @@ _e_busywin_cb_animate(void *data)
 	  edje_object_signal_emit(esw->base_obj, "e,state,out,end", "e");
 	else
 	  edje_object_signal_emit(esw->base_obj, "e,state,in,end", "e");
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -216,8 +216,8 @@ _e_busywin_slide(E_Busywin *esw, int out, double len)
      esw->animator = ecore_animator_add(_e_busywin_cb_animate, esw);
 }
 
-static int
-_e_busywin_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_busywin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Busywin *esw;
@@ -229,11 +229,11 @@ _e_busywin_cb_mouse_up(void *data, int type, void *event)
 	if (esw->out) _e_busywin_slide(esw, 0, (double)illume_cfg->sliding.busywin.duration / 1000.0);
 	else _e_busywin_slide(esw, 1, (double)illume_cfg->sliding.busywin.duration / 1000.0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_busywin_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_busywin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    E_Busywin *esw;
@@ -248,7 +248,7 @@ _e_busywin_cb_zone_move_resize(void *data, int type, void *event)
 			    esw->zone->w, esw->popup->h);
 	evas_object_resize(esw->base_obj, esw->popup->w, esw->popup->h);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 
diff --git a/src/modules/illume/e_cfg.c b/src/modules/illume/e_cfg.c
index 532995bc4..8c3c5e1dd 100644
--- a/src/modules/illume/e_cfg.c
+++ b/src/modules/illume/e_cfg.c
@@ -161,10 +161,13 @@ e_cfg_save(void)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_launcher_change_timer = NULL;
-static int _e_cfg_launcher_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_launcher_change_timeout(__UNUSED__ void *data)
+{
    _e_mod_win_cfg_update();
    e_config_save_queue();
-   _e_cfg_launcher_change_timer = NULL; return 0;
+   _e_cfg_launcher_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_launcher_change(void *data, Evas_Object *obj, void *event_info) {
@@ -269,7 +272,9 @@ e_cfg_launcher(E_Container *con, const char *params)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_power_change_timer = NULL;
-static int _e_cfg_power_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_power_change_timeout(void *data)
+{
    if (e_config->screensaver_timeout > 0)
      {
 	e_config->screensaver_enable = 1;
@@ -290,7 +295,8 @@ static int _e_cfg_power_change_timeout(void *data) {
      }
    e_pwr_cfg_update();
    e_config_save_queue();
-   _e_cfg_power_change_timer = NULL; return 0;
+   _e_cfg_power_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_power_change(void *data, Evas_Object *obj, void *event_info) {
@@ -392,9 +398,12 @@ e_cfg_power(E_Container *con, const char *params)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_animation_change_timer = NULL;
-static int _e_cfg_animation_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_animation_change_timeout(__UNUSED__ void *data)
+{
    e_config_save_queue();
-   _e_cfg_animation_change_timer = NULL; return 0;
+   _e_cfg_animation_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_animation_change(void *data, Evas_Object *obj, void *event_info) {
@@ -522,10 +531,13 @@ e_cfg_animation(E_Container *con, const char *params)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_slipshelf_change_timer = NULL;
-static int _e_cfg_slipshelf_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_slipshelf_change_timeout(__UNUSED__ void *data)
+{
    _e_mod_win_slipshelf_cfg_update();
    e_config_save_queue();
-   _e_cfg_slipshelf_change_timer = NULL; return 0;
+   _e_cfg_slipshelf_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_slipshelf_change(void *data, Evas_Object *obj, void *event_info) {
@@ -639,7 +651,9 @@ e_cfg_slipshelf(E_Container *con, const char *params)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_thumbscroll_change_timer = NULL;
-static int _e_cfg_thumbscroll_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_thumbscroll_change_timeout(__UNUSED__ void *data)
+{
    if (e_config->thumbscroll_threshhold == 0)
      {
 	e_config->thumbscroll_enable = 0;
@@ -651,7 +665,8 @@ static int _e_cfg_thumbscroll_change_timeout(void *data) {
 	e_config->thumbscroll_friction = 1.0;
      }
    e_config_save_queue();
-   _e_cfg_thumbscroll_change_timer = NULL; return 0;
+   _e_cfg_thumbscroll_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_thumbscroll_change(void *data, Evas_Object *obj, void *event_info) {
@@ -728,11 +743,14 @@ e_cfg_thumbscroll(E_Container *con, const char *params)
 
 ///////////////////////////////////////////////////////////////////////////////
 Ecore_Timer *_e_cfg_fps_change_timer = NULL;
-static int _e_cfg_fps_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_fps_change_timeout(__UNUSED__ void *data)
+{
    e_config->framerate = illume_cfg->performance.fps;
    edje_frametime_set(1.0 / e_config->framerate);
    e_config_save_queue();
-   _e_cfg_fps_change_timer = NULL; return 0;
+   _e_cfg_fps_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_fps_change(void *data, Evas_Object *obj, void *event_info) {
@@ -822,7 +840,9 @@ struct _Gadit
 E_Slipshelf *local_slipshelf = NULL;
 Eina_List *gadits = NULL;
 Ecore_Timer *_e_cfg_gadgets_change_timer = NULL;
-static int _e_cfg_gadgets_change_timeout(void *data) {
+static Eina_Bool
+_e_cfg_gadgets_change_timeout(__UNUSED__ void *data)
+{
    Eina_List *l2;
 	Gadit *gi;
    int update = 0;
@@ -855,7 +875,8 @@ static int _e_cfg_gadgets_change_timeout(void *data) {
         e_gadcon_populate(local_slipshelf->gadcon_extra);
      }
    e_config_save_queue();
-   _e_cfg_gadgets_change_timer = NULL; return 0;
+   _e_cfg_gadgets_change_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_gadgets_change(void *data, Evas_Object *obj, void *event_info) {
@@ -985,7 +1006,8 @@ e_cfg_gadgets(E_Container *con, const char *params)
 int external_keyboard = 0;
 Ecore_Timer *_e_cfg_keyboard_change_timer = NULL;
 
-static int _e_cfg_keyboard_change_timeout(void *data)
+static Eina_Bool
+_e_cfg_keyboard_change_timeout(__UNUSED__ void *data)
 {
    Eina_List *l;
 
@@ -1032,7 +1054,7 @@ static int _e_cfg_keyboard_change_timeout(void *data)
    e_mod_win_cfg_kbd_update();
    e_config_save_queue();
    _e_cfg_keyboard_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 static void
 _e_cfg_keyboard_change(void *data, Evas_Object *obj, void *event_info) {
diff --git a/src/modules/illume/e_flaunch.c b/src/modules/illume/e_flaunch.c
index d6869d4b3..5f456488c 100644
--- a/src/modules/illume/e_flaunch.c
+++ b/src/modules/illume/e_flaunch.c
@@ -166,8 +166,8 @@ _e_flaunch_free(E_Flaunch *fl)
    free(fl);
 }
 
-static int
-_e_flaunch_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_flaunch_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {       
    E_Event_Zone_Move_Resize *ev;
    E_Flaunch *fl;
@@ -179,10 +179,10 @@ _e_flaunch_cb_zone_move_resize(void *data, int type, void *event)
 	evas_object_move(fl->box_obj, fl->zone->x, fl->zone->y + fl->zone->h - fl->height);
 	evas_object_resize(fl->box_obj, fl->zone->w, fl->height);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _e_flaunch_cb_delayed_repopulate(void *data)
 {
    E_Flaunch *fl;
@@ -191,18 +191,18 @@ _e_flaunch_cb_delayed_repopulate(void *data)
    _e_flaunch_apps_clear(fl);
    _e_flaunch_apps_populate(fl);
    fl->repopulate_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
-_e_flaunch_cb_cache_update(void *data, int type, void *event)
-{       
+static Eina_Bool
+_e_flaunch_cb_cache_update(void *data, __UNUSED__ int type, void *event)
+{
    E_Flaunch *fl;
    
    fl = data;
    if (fl->repopulate_timer) ecore_timer_del(fl->repopulate_timer);
    fl->repopulate_timer = ecore_timer_add(0.5, _e_flaunch_cb_delayed_repopulate, fl);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 EAPI int
diff --git a/src/modules/illume/e_kbd.c b/src/modules/illume/e_kbd.c
index 2982048bd..64902dcbd 100644
--- a/src/modules/illume/e_kbd.c
+++ b/src/modules/illume/e_kbd.c
@@ -62,7 +62,7 @@ _e_kbd_border_show(E_Kbd *kbd, E_Border *bd)
    e_border_raise(bd);
 }
 
-static int
+static Eina_Bool
 _e_kbd_cb_animate(void *data)
 {
    E_Kbd *kbd;
@@ -98,9 +98,9 @@ _e_kbd_cb_animate(void *data)
 	  }
 	_e_kbd_apply_all_job_queue();
 	_e_kbd_layout_send(kbd);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -200,7 +200,7 @@ _e_kbd_by_border_get(E_Border *bd)
    return NULL;
 }
 
-static int
+static Eina_Bool
 _e_kbd_cb_delayed_hide(void *data)
 {
    E_Kbd *kbd;
@@ -208,7 +208,7 @@ _e_kbd_cb_delayed_hide(void *data)
    kbd = data;
    _e_kbd_hide(kbd);
    kbd->delay_hide = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -274,8 +274,8 @@ _e_kbd_all_toggle(void)
      }
 }
 
-static int
-_e_kbd_cb_client_message(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_cb_client_message(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Client_Message *ev;
    
@@ -288,11 +288,11 @@ _e_kbd_cb_client_message(void *data, int type, void *event)
 	else if (ev->data.l[0] == 2) _e_kbd_all_hide();
 	else if (ev->data.l[0] == 3) _e_kbd_all_toggle();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_kbd_cb_border_remove(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_cb_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev;
    E_Kbd *kbd;
@@ -302,11 +302,11 @@ _e_kbd_cb_border_remove(void *data, int type, void *event)
      {
 	focused_border = NULL;
 	focused_vkbd_state = 0;
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    // if border is in a created kbd - unstore
    kbd = _e_kbd_by_border_get(ev->border);
-   if (!kbd) return 1;
+   if (!kbd) return ECORE_CALLBACK_PASS_ON;
    if (kbd->border == ev->border)
      {
 	kbd->border = NULL;
@@ -329,16 +329,16 @@ _e_kbd_cb_border_remove(void *data, int type, void *event)
      }
    else
      kbd->waiting_borders = eina_list_remove(kbd->waiting_borders, ev->border);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_kbd_cb_border_focus_in(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_cb_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev;
    
    ev = event;
-   if (_e_kbd_by_border_get(ev->border)) return 1;
+   if (_e_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
    // FIXME: if ev->border->client.vkbd.state == 0 then this app doesnt know
    // how to request for a virtual keyboard and so we should have a manual
    // override
@@ -353,7 +353,7 @@ _e_kbd_cb_border_focus_in(void *data, int type, void *event)
      {
 	_e_kbd_all_layout_set(E_KBD_LAYOUT_NONE);
 	_e_kbd_all_hide();
-	return 1;
+	return ECORE_CALLBACK_PASS_ON;
      }
    else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ALPHA)
      _e_kbd_all_layout_set(E_KBD_LAYOUT_ALPHA);
@@ -372,16 +372,16 @@ _e_kbd_cb_border_focus_in(void *data, int type, void *event)
    else
      _e_kbd_all_layout_set(E_KBD_LAYOUT_DEFAULT);
    _e_kbd_all_show();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_kbd_cb_border_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_cb_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev;
 
    ev = event;
-   if (_e_kbd_by_border_get(ev->border)) return 1;
+   if (_e_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
    if ((ev->border->need_fullscreen) || (ev->border->fullscreen))
      e_kbd_fullscreen_set(ev->border->zone, 1);
    else e_kbd_fullscreen_set(ev->border->zone, 0);
@@ -389,28 +389,28 @@ _e_kbd_cb_border_focus_out(void *data, int type, void *event)
    _e_kbd_all_hide();
    focused_border = NULL;
    focused_vkbd_state = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_kbd_cb_border_property(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_cb_border_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Property *ev;
    
    ev = event;
-   if (_e_kbd_by_border_get(ev->border)) return 1;
-   if (!ev->border->focused) return 1;
+   if (_e_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
+   if (!ev->border->focused) return ECORE_CALLBACK_PASS_ON;
    /* nothing happened to vkbd prop - leave everything alone */
    if ((ev->border == focused_border) &&
        (ev->border->client.vkbd.state == focused_vkbd_state))
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    focused_vkbd_state = ev->border->client.vkbd.state;
    /* app doesn't know what to do - just leave everything as-is */
    if ((ev->border->need_fullscreen) || (ev->border->fullscreen))
      e_kbd_fullscreen_set(ev->border->zone, 1);
    else e_kbd_fullscreen_set(ev->border->zone, 0);
    if (ev->border->client.vkbd.state == 0)
-     return 1;
+     return ECORE_CALLBACK_PASS_ON;
    /* app wats kbd off - then kbd off it is */
    else if (ev->border->client.vkbd.state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF)
      _e_kbd_all_hide();
@@ -435,7 +435,7 @@ _e_kbd_cb_border_property(void *data, int type, void *event)
 	  _e_kbd_all_layout_set(E_KBD_LAYOUT_DEFAULT);
 	_e_kbd_all_show();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume/e_kbd_buf.c b/src/modules/illume/e_kbd_buf.c
index 650d22fdf..cd29abc9c 100644
--- a/src/modules/illume/e_kbd_buf.c
+++ b/src/modules/illume/e_kbd_buf.c
@@ -220,7 +220,7 @@ _e_kbd_buf_matches_update(E_Kbd_Buf *kb)
      }
 }
 
-static int
+static Eina_Bool
 _e_kbd_buf_cb_data_dict_reload(void *data)
 {
    E_Kbd_Buf *kb;
@@ -232,7 +232,7 @@ _e_kbd_buf_cb_data_dict_reload(void *data)
    if (kb->dict.data) e_kbd_dict_free(kb->dict.data);
    e_user_dir_concat_static(buf, "dicts-dynamic/data.dic");
    kb->dict.data = e_kbd_dict_new(buf);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -536,7 +536,7 @@ e_kbd_buf_word_use(E_Kbd_Buf *kb, const char *word)
 }
 
 // FIXME: just faking delayed lookup with timer
-static int
+static Eina_Bool
 _e_kbd_buf_cb_faket(void *data)
 {
    E_Kbd_Buf *kb;
@@ -546,7 +546,7 @@ _e_kbd_buf_cb_faket(void *data)
    kb->lookup.func(kb->lookup.data);
    kb->lookup.func = NULL;
    kb->lookup.data = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 EAPI void
diff --git a/src/modules/illume/e_kbd_dict.c b/src/modules/illume/e_kbd_dict.c
index 9eac2a674..d2c69c494 100644
--- a/src/modules/illume/e_kbd_dict.c
+++ b/src/modules/illume/e_kbd_dict.c
@@ -443,7 +443,7 @@ e_kbd_dict_save(E_Kbd_Dict *kd)
      _e_kbd_dict_lookup_build(kd);
 }
 
-static int
+static Eina_Bool
 _e_kbd_dict_cb_save_flush(void *data)
 {
    E_Kbd_Dict *kd;
@@ -453,10 +453,10 @@ _e_kbd_dict_cb_save_flush(void *data)
        (kd->word.letters) ||
        (kd->matches.deadends) ||
        (kd->matches.leads))
-     return 1;
+     return ECORE_CALLBACK_RENEW;
    kd->changed.flush_timer = NULL;
    e_kbd_dict_save(kd);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/modules/illume/e_kbd_int.c b/src/modules/illume/e_kbd_int.c
index c2b3db5f9..ae6c029ce 100644
--- a/src/modules/illume/e_kbd_int.c
+++ b/src/modules/illume/e_kbd_int.c
@@ -655,7 +655,7 @@ _e_kbd_int_zoomkey_update(E_Kbd_Int *ki)
      }
 }
 
-static int
+static Eina_Bool
 _e_kbd_int_cb_hold_timeout(void *data)
 {
    E_Kbd_Int *ki;
@@ -672,7 +672,7 @@ _e_kbd_int_cb_hold_timeout(void *data)
      }
    _e_kbd_int_zoomkey_up(ki);
    _e_kbd_int_zoomkey_update(ki);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -1285,8 +1285,8 @@ _e_kbd_int_layout_next(E_Kbd_Int *ki)
    _e_kbd_int_layout_select(ki, kil);
 }
 
-static int
-_e_kbd_int_cb_client_message(void *data, int type, void *event)
+static Eina_Bool
+_e_kbd_int_cb_client_message(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_X_Event_Client_Message *ev;
    E_Kbd_Int *ki;
@@ -1345,7 +1345,7 @@ _e_kbd_int_cb_client_message(void *data, int type, void *event)
 	     if (kil) _e_kbd_int_layout_select(ki, kil);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/illume/e_mod_gad_bluetooth.c b/src/modules/illume/e_mod_gad_bluetooth.c
index 679cd77e2..0401e6844 100644
--- a/src/modules/illume/e_mod_gad_bluetooth.c
+++ b/src/modules/illume/e_mod_gad_bluetooth.c
@@ -30,7 +30,7 @@ static const E_Gadcon_Client_Class _gadcon_class =
 };
 static E_Module *mod = NULL;
 
-static int _cb_poll(void *data);
+static Eina_Bool _cb_poll(void *data);
 
 /* called from the module core */
 void
@@ -189,7 +189,7 @@ _find_interface_class(int iclass)
    return 0;
 }
 
-static int
+static Eina_Bool
 _cb_poll(void *data)
 {
    Instance *inst;
@@ -206,5 +206,5 @@ _cb_poll(void *data)
 	else
 	  edje_object_signal_emit(inst->obj, "e,state,passive", "e");
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume/e_mod_gad_gsm.c b/src/modules/illume/e_mod_gad_gsm.c
index 8151eea84..4b82e8486 100644
--- a/src/modules/illume/e_mod_gad_gsm.c
+++ b/src/modules/illume/e_mod_gad_gsm.c
@@ -50,7 +50,7 @@ static const E_Gadcon_Client_Class _gadcon_class =
 };
 static E_Module *mod = NULL;
 
-static int try_again(void *data);
+static Eina_Bool try_again(void *data);
 static void *signal_unmarhsall(DBusMessage *msg, DBusError *err);
 static void *operator_unmarhsall(DBusMessage *msg, DBusError *err);
 static void signal_callback_qtopia(void *data, void *ret, DBusError *err);
@@ -66,14 +66,14 @@ static void operator_changed(void *data, DBusMessage *msg);
 static void fso_operator_changed(void *data, DBusMessage *msg);
 static void name_changed(void *data, DBusMessage *msg);
 
-static int
+static Eina_Bool
 try_again(void *data)
 {
 //   printf("GSM-gadget: Try again called\n");
    get_signal(data);
    get_operator(data);
    try_again_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 /* called from the module core */
diff --git a/src/modules/illume/e_mod_gad_wifi.c b/src/modules/illume/e_mod_gad_wifi.c
index 9009dd240..d195c9aef 100644
--- a/src/modules/illume/e_mod_gad_wifi.c
+++ b/src/modules/illume/e_mod_gad_wifi.c
@@ -39,8 +39,8 @@ static E_Module *mod = NULL;
 
 static void _wifiget_spawn(Instance *inst);
 static void _wifiget_kill(Instance *inst);
-static int _wifiget_cb_exe_data(void *data, int type, void *event);
-static int _wifiget_cb_exe_del(void *data, int type, void *event);
+static Eina_Bool _wifiget_cb_exe_data(void *data, int type, void *event);
+static Eina_Bool _wifiget_cb_exe_del(void *data, int type, void *event);
 
 /* called from the module core */
 void
@@ -199,8 +199,8 @@ _wifiget_kill(Instance *inst)
    inst->wifiget_del_handler = NULL;
 }
 
-static int
-_wifiget_cb_exe_data(void *data, int type, void *event)
+static Eina_Bool
+_wifiget_cb_exe_data(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Data *ev;
    Instance *inst;
@@ -208,7 +208,7 @@ _wifiget_cb_exe_data(void *data, int type, void *event)
    
    inst = data;
    ev = event;
-   if (ev->exe != inst->wifiget_exe) return 1;
+   if (ev->exe != inst->wifiget_exe) return ECORE_CALLBACK_PASS_ON;
    pstrength = inst->strength;
    if ((ev->lines) && (ev->lines[0].line))
      {
@@ -234,18 +234,18 @@ _wifiget_cb_exe_data(void *data, int type, void *event)
 	msg.val = level;
 	edje_object_message_send(inst->obj, EDJE_MESSAGE_FLOAT, 1, &msg);
      }
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int 
-_wifiget_cb_exe_del(void *data, int type, void *event)
+static Eina_Bool
+_wifiget_cb_exe_del(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    Instance *inst;
   
    inst = data;
    ev = event;
-   if (ev->exe != inst->wifiget_exe) return 1;
+   if (ev->exe != inst->wifiget_exe) return ECORE_CALLBACK_PASS_ON;
    inst->wifiget_exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume/e_mod_layout.c b/src/modules/illume/e_mod_layout.c
index aade4f3db..c499d0a1a 100644
--- a/src/modules/illume/e_mod_layout.c
+++ b/src/modules/illume/e_mod_layout.c
@@ -23,20 +23,20 @@ struct _Effect
 };
 
 /* internal calls */
-static int _e_mod_layout_cb_effect_animator(void *data);
+static Eina_Bool _e_mod_layout_cb_effect_animator(void *data);
 static void _e_mod_layout_effect_slide_out(E_Border *bd, double in, int post);
 static void _e_mod_layout_effect_slide_in(E_Border *bd, double in, int post);
 static void _e_mod_layout_cb_hook_post_fetch(void *data, void *data2);
 static void _e_mod_layout_post_border_assign(E_Border *bd, int not_new);
 static void _e_mod_layout_cb_hook_post_border_assign(void *data, void *data2);
 static void _e_mod_layout_cb_hook_end(void *data, void *data2);
-static int _cb_event_border_add(void *data, int type, void *event);
-static int _cb_event_border_remove(void *data, int type, void *event);
-static int _cb_event_border_focus_in(void *data, int type, void *event);
-static int _cb_event_border_focus_out(void *data, int type, void *event);
-static int _cb_event_border_show(void *data, int type, void *event);
-static int _cb_event_border_hide(void *data, int type, void *event);
-static int _cb_event_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_add(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_remove(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_focus_in(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_focus_out(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_show(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_hide(void *data, int type, void *event);
+static Eina_Bool _cb_event_zone_move_resize(void *data, int type, void *event);
 
 /* state */
 static E_Border_Hook *hook1 = NULL;
@@ -206,7 +206,7 @@ _e_mod_layout_apply_all(void)
 }
 
 /* internal calls */
-static int
+static Eina_Bool
 _e_mod_layout_cb_effect_animator(void *data)
 {
    Effect *ef;
@@ -255,9 +255,9 @@ _e_mod_layout_cb_effect_animator(void *data)
 	e_border_fx_offset(ef->border, 0, 0);
 	effects = eina_list_remove(effects, ef);
 	free(ef);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -313,13 +313,13 @@ _e_mod_layout_effect_slide_in(E_Border *bd, double in, int post)
 
 static Ecore_Timer *_dockwin_hide_timer = NULL;
 
-static int
+static Eina_Bool
 _e_mod_layout_cb_docwin_hide(void *data)
 {
    _dockwin_hide_timer = NULL;
-   if (!dockwin) return 0;
+   if (!dockwin) return ECORE_CALLBACK_CANCEL;
    e_border_hide(dockwin, 2);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -692,24 +692,24 @@ _e_mod_layout_cb_hook_end(void *data, void *data2)
      _e_mod_layout_dockwin_hide();
 }
 
-static int
-_cb_event_border_add(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev;
 
    ev = event;
-   if (ev->border->stolen) return 1;
-   return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON; /* FIXME: Woot ? */
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_border_remove(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev;
    Eina_List *l, *pl;
 
    ev = event;
-   if (ev->border->stolen) return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON;
    if (ev->border == dockwin)
      {
 	unsigned int area[4];
@@ -742,17 +742,17 @@ _cb_event_border_remove(void *data, int type, void *event)
 	     free(ef);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_border_focus_in(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev;
    E_Border *bd;
 
    ev = event;
-   if (ev->border->stolen) return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON;
    bd = ev->border;
    if (bd != dockwin)
      {
@@ -767,17 +767,17 @@ _cb_event_border_focus_in(void *data, int type, void *event)
 	       _e_mod_layout_dockwin_hide();
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_border_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev;
    E_Border *bd;
 
    ev = event;
-   if (ev->border->stolen) return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON;
    bd = ev->border;
    if (bd != dockwin)
      {
@@ -787,33 +787,33 @@ _cb_event_border_focus_out(void *data, int type, void *event)
 	       _e_mod_layout_dockwin_hide();
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_border_show(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Show *ev;
 
    ev = event;
-   if (ev->border->stolen) return 1;
-   return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON; /* FIXME: woot ?*/
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_border_hide(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_hide(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Hide *ev;
 
    ev = event;
-   if (ev->border->stolen) return 1;
-   return 1;
+   if (ev->border->stolen) return ECORE_CALLBACK_PASS_ON; /* FIXME: woot ? */
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    _e_mod_layout_apply_all();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
diff --git a/src/modules/illume/e_mod_win.c b/src/modules/illume/e_mod_win.c
index 7feb09072..9eddb57b6 100644
--- a/src/modules/illume/e_mod_win.c
+++ b/src/modules/illume/e_mod_win.c
@@ -31,15 +31,15 @@ static void _app_close(E_Border *bd);
 
 static void _cb_cfg_exec(const void *data, E_Container *con, const char *params, Efreet_Desktop *desktop);
 static void _desktop_run(Efreet_Desktop *desktop);
-static int _cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _cb_zone_move_resize(void *data, int type, void *event);
 static void _cb_resize(void);
 static void _cb_run(void *data);
-static int _cb_event_border_add(void *data, int type, void *event);
-static int _cb_event_border_remove(void *data, int type, void *event);
-static int _cb_event_border_focus_in(void *data, int type, void *event);
-static int _cb_event_border_focus_out(void *data, int type, void *event);
-static int _cb_event_exe_del(void *data, int type, void *event);
-static int _cb_run_timeout(void *data);
+static Eina_Bool _cb_event_border_add(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_remove(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_focus_in(void *data, int type, void *event);
+static Eina_Bool _cb_event_border_focus_out(void *data, int type, void *event);
+static Eina_Bool _cb_event_exe_del(void *data, int type, void *event);
+static Eina_Bool _cb_run_timeout(void *data);
 static int _have_borders(void);
 static void _cb_slipshelf_home(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
 static void _cb_slipshelf_close(const void *data, E_Slipshelf *ess, E_Slipshelf_Action action);
@@ -51,10 +51,10 @@ static void _cb_slipwin_border_select(void *data, E_Slipwin *esw, E_Border *bd);
 static void _cb_slipshelf_border_select(void *data, E_Slipshelf *ess, E_Border *bd);
 static void _cb_slipshelf_border_home2(void *data, E_Slipshelf *ess, E_Border *pbd);
 static void _cb_selected(void *data, Evas_Object *obj, void *event_info);
-static int _cb_efreet_cache_update(void *data, int type, void *event);
+static Eina_Bool _cb_efreet_cache_update(void *data, int type, void *event);
 static void _apps_unpopulate(void);
 static void _apps_populate(void);
-static int _cb_update_deferred(void *data);
+static Eina_Bool _cb_update_deferred(void *data);
 static void _cb_sys_con_close(void *data);
 static void _cb_sys_con_home(void *data);
 
@@ -231,14 +231,14 @@ _e_mod_win_shutdown(void)
 static Ecore_Exe           *_kbd_exe = NULL;
 static Ecore_Event_Handler *_kbd_exe_exit_handler = NULL;
 
-static int
-_e_mod_win_win_cfg_kbd_cb_exit(void *data, int type, void *event)
+static Eina_Bool
+_e_mod_win_win_cfg_kbd_cb_exit(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
 
    ev = event;
    if (ev->exe ==_kbd_exe) _kbd_exe = NULL;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
   
 void
@@ -545,11 +545,11 @@ _app_close(E_Border *bd)
 
 /////////
 
-static int
-_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_cb_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, __UNUSED__ void *event)
 {
    _cb_resize();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -698,8 +698,8 @@ _cb_run(void *data)
    _desktop_run(desktop);
 }
 
-static int 
-_cb_event_border_add(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev;
    Instance *ins;
@@ -729,14 +729,14 @@ _cb_event_border_add(void *data, int type, void *event)
 		  if (ins->timeout) ecore_timer_del(ins->timeout);
 		  ins->timeout = NULL;
 		  // FIXME; if gadget is disabled, enable it
-		  return 1;
+		  return ECORE_CALLBACK_PASS_ON;
 	       }
 	  }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_cb_event_border_remove(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev;
    Instance *ins;
@@ -760,13 +760,13 @@ _cb_event_border_remove(void *data, int type, void *event)
 		  ins->handle = NULL;
 	       }
 	     ins->border = NULL;
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_cb_event_border_focus_in(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev;
    
@@ -776,11 +776,11 @@ _cb_event_border_focus_in(void *data, int type, void *event)
      sys_con_act_close->disabled = 0;
    if (sys_con_act_home)
      sys_con_act_home->disabled = 0;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_cb_event_border_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev;
    
@@ -790,11 +790,11 @@ _cb_event_border_focus_out(void *data, int type, void *event)
      sys_con_act_close->disabled = 1;
    if (sys_con_act_home)
      sys_con_act_home->disabled = 1;
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_event_exe_del(void *data, int type, void *event)
+static Eina_Bool
+_cb_event_exe_del(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    Instance *ins;
@@ -814,13 +814,13 @@ _cb_event_exe_del(void *data, int type, void *event)
 	     instances = eina_list_remove_list(instances, l);
 	     if (ins->timeout) ecore_timer_del(ins->timeout);
 	     free(ins);
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _cb_run_timeout(void *data)
 {
    Instance *ins;
@@ -836,10 +836,10 @@ _cb_run_timeout(void *data)
      {
 	instances = eina_list_remove(instances, ins);
 	free(ins);
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
    ins->timeout = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int
@@ -1204,8 +1204,8 @@ _cb_selected(void *data, Evas_Object *obj, void *event_info)
      }
 }
 
-static int
-_cb_efreet_cache_update(void *data, int type, void *event)
+static Eina_Bool
+_cb_efreet_cache_update(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Efreet_Desktop *desktop;
 
@@ -1217,7 +1217,7 @@ _cb_efreet_cache_update(void *data, int type, void *event)
    return 1;
 }
 
-static int
+static Eina_Bool
 _cb_update_deferred(void *data)
 {
    _apps_unpopulate();
@@ -1225,7 +1225,7 @@ _cb_update_deferred(void *data)
    e_mod_win_cfg_kbd_update();
    e_pwr_init_done();
    defer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
diff --git a/src/modules/illume/e_pwr.c b/src/modules/illume/e_pwr.c
index 9593666f8..4dd0682b8 100644
--- a/src/modules/illume/e_pwr.c
+++ b/src/modules/illume/e_pwr.c
@@ -5,7 +5,7 @@
 /* internal calls */
 static void _system_req_state(const char *state);
 static void _system_unreq_state(void);
-static int _cb_saver(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_saver(void *data, int ev_type, void *ev);
     
 /* state */
 static Ecore_Event_Handler *save_handler = NULL;
@@ -121,7 +121,7 @@ _system_unreq_state(void)
 }
 
 /* internal calls */
-static int
+static Eina_Bool
 _cb_suspend(void *data)
 {
    suspended = 1;
@@ -134,10 +134,10 @@ _cb_suspend(void *data)
 //	ecore_exe_run("apm -s", NULL);
      }
    suspend_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _cb_saver(void *data, int ev_type, void *ev)
 {
    Ecore_X_Event_Screensaver_Notify *event;
@@ -193,5 +193,5 @@ _cb_saver(void *data, int ev_type, void *ev)
 	     suspended = 0;
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
diff --git a/src/modules/illume/e_simplelock.c b/src/modules/illume/e_simplelock.c
index 79f42cdeb..9b01c80b5 100644
--- a/src/modules/illume/e_simplelock.c
+++ b/src/modules/illume/e_simplelock.c
@@ -16,8 +16,8 @@ struct _E_Simplelock_Data
 };
 
 static void _e_action_simplelock_cb(E_Object *obj, const char *params);
-static int _e_simplelock_cb_key_down(void *data, int type, void *event);
-static int _e_simplelock_cb_key_up(void *data, int type, void *event);
+static Eina_Bool _e_simplelock_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _e_simplelock_cb_key_up(void *data, int type, void *event);
 
 static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group);
 
@@ -37,7 +37,7 @@ _e_action_simplelock_cb(E_Object *obj, const char *params)
      e_simplelock_show();
 }
 
-static int
+static Eina_Bool
 _e_simplelock_cb_key_down(void *data, int type, void *event)
 {
    Ecore_Event_Key *ev;
@@ -47,7 +47,7 @@ _e_simplelock_cb_key_down(void *data, int type, void *event)
    E_Binding_Modifier mod;
       
    ev = event;
-   if (ev->event_window != grab_win) return 1;
+   if (ev->event_window != grab_win) return ECORE_CALLBACK_PASS_ON;
    for (l = e_config->key_bindings; l; l = l->next)
      {
 	bind = l->data;
@@ -70,21 +70,21 @@ _e_simplelock_cb_key_down(void *data, int type, void *event)
 	     e_simplelock_hide();
 	  }
      }
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_simplelock_cb_key_up(void *data, int type, void *event)
+static Eina_Bool
+_e_simplelock_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
       
    ev = event;
-   if (ev->event_window != grab_win) return 1;
-   return 0;
+   if (ev->event_window != grab_win) return ECORE_CALLBACK_PASS_ON;
+   return ECORE_CALLBACK_DONE;
 }
 
-static int
-_e_simplelock_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_simplelock_cb_zone_move_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    Eina_List *l;
@@ -115,7 +115,7 @@ _e_simplelock_cb_zone_move_resize(void *data, int type, void *event)
 					esl->zone->w, esl->zone->h);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /***********************************************************************/
diff --git a/src/modules/illume/e_slipshelf.c b/src/modules/illume/e_slipshelf.c
index daee9990f..9551055e6 100644
--- a/src/modules/illume/e_slipshelf.c
+++ b/src/modules/illume/e_slipshelf.c
@@ -19,15 +19,15 @@ static void _e_slipshelf_cb_keyboard(void *data, Evas_Object *obj, const char *e
 static void _e_slipshelf_cb_app_next(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_slipshelf_cb_app_prev(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _e_slipshelf_cb_item_sel(void *data, E_Border *bd);
-static int _e_slipshelf_cb_animate(void *data);
+static Eina_Bool _e_slipshelf_cb_animate(void *data);
 static void _e_slipshelf_slide(E_Slipshelf *ess, int out, double len);
-static int _e_slipshelf_cb_mouse_up(void *data, int type, void *event);
-static int _e_slipshelf_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_slipshelf_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_slipshelf_cb_zone_move_resize(void *data, int type, void *event);
 static void _e_slipshelf_event_simple_free(void *data, void *ev);
 static void _e_slipshelf_object_del_attach(void *o);
-static int _e_slipshelf_cb_border_focus_in(void *data, int type, void *event);
-static int _e_slipshelf_cb_border_focus_out(void *data, int type, void *event);
-static int _e_slipshelf_cb_border_property(void *data, int type, void *event);
+static Eina_Bool _e_slipshelf_cb_border_focus_in(void *data, int type, void *event);
+static Eina_Bool _e_slipshelf_cb_border_focus_out(void *data, int type, void *event);
+static Eina_Bool _e_slipshelf_cb_border_property(void *data, int type, void *event);
 static void _e_slipshelf_title_update(E_Slipshelf *ess);
 static void _e_slipshelf_cb_gadcon_min_size_request(void *data, E_Gadcon *gc, Evas_Coord w, Evas_Coord h);
 static Evas_Object *_e_slipshelf_cb_gadcon_frame_request(void *data, E_Gadcon_Client *gcc, const char *style);
@@ -556,7 +556,7 @@ _e_slipshelf_cb_app_prev(void *data, Evas_Object *obj, const char *emission, con
    _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
 }
 
-static int
+static Eina_Bool
 _e_slipshelf_cb_slide_down_delay(void *data)
 {
    E_Slipshelf *ess;
@@ -564,7 +564,7 @@ _e_slipshelf_cb_slide_down_delay(void *data)
    ess = data;
    _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
    ess->slide_down_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -652,7 +652,7 @@ _e_slipshelf_applist_update(E_Slipshelf *ess)
    evas_object_resize(ess->base_obj, ess->popup->w, ess->popup->h);
 }
 
-static int
+static Eina_Bool
 _e_slipshelf_cb_animate(void *data)
 {
    E_Slipshelf *ess;
@@ -690,9 +690,9 @@ _e_slipshelf_cb_animate(void *data)
 	     edje_object_signal_emit(ess->control_obj, "e,state,in,end", "e");
 	     edje_object_signal_emit(ess->base_obj, "e,state,in,end", "e");
 	  }
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -733,8 +733,8 @@ _e_slipshelf_slide(E_Slipshelf *ess, int out, double len)
      ess->animator = ecore_animator_add(_e_slipshelf_cb_animate, ess);
 }
 
-static int
-_e_slipshelf_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_slipshelf_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Slipshelf *ess;
@@ -748,11 +748,11 @@ _e_slipshelf_cb_mouse_up(void *data, int type, void *event)
 	if (ess->out) _e_slipshelf_slide(ess, 0, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
 	else _e_slipshelf_slide(ess, 1, (double)illume_cfg->sliding.slipshelf.duration / 1000.0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_slipshelf_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_slipshelf_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    E_Slipshelf *ess;
@@ -770,11 +770,11 @@ _e_slipshelf_cb_zone_move_resize(void *data, int type, void *event)
 			    ess->zone->w, ess->popup->h);
 	evas_object_resize(ess->base_obj, ess->popup->w, ess->popup->h);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
-_e_slipshelf_event_simple_free(void *data, void *ev)
+_e_slipshelf_event_simple_free(__UNUSED__ void *data, void *ev)
 {
    struct _E_Event_Slipshelf_Simple *e;
    
@@ -797,9 +797,9 @@ _e_slipshelf_object_del_attach(void *o)
 /*    ecore_event_add(E_EVENT_SLIPSHELF_DEL, ev,  */
 /* 		   _e_slipshelf_event_simple_free, NULL); */
 }
-    
-static int
-_e_slipshelf_cb_border_focus_in(void *data, int type, void *event)
+
+static Eina_Bool
+_e_slipshelf_cb_border_focus_in(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev;
    E_Slipshelf *ess;
@@ -808,11 +808,11 @@ _e_slipshelf_cb_border_focus_in(void *data, int type, void *event)
    ess = data;
    ess->focused_border = ev->border;
    _e_slipshelf_title_update(ess);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_slipshelf_cb_border_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_e_slipshelf_cb_border_focus_out(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev;
    E_Slipshelf *ess;
@@ -822,11 +822,11 @@ _e_slipshelf_cb_border_focus_out(void *data, int type, void *event)
    if (ess->focused_border == ev->border)
      ess->focused_border = NULL;
    _e_slipshelf_title_update(ess);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_slipshelf_cb_border_property(void *data, int type, void *event)
+static Eina_Bool
+_e_slipshelf_cb_border_property(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Property *ev;
    E_Slipshelf *ess;
@@ -835,7 +835,7 @@ _e_slipshelf_cb_border_property(void *data, int type, void *event)
    ess = data;
    if (ess->focused_border == ev->border)
      _e_slipshelf_title_update(ess);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/illume/e_slipwin.c b/src/modules/illume/e_slipwin.c
index 6ff512175..cf23c9caa 100644
--- a/src/modules/illume/e_slipwin.c
+++ b/src/modules/illume/e_slipwin.c
@@ -16,11 +16,11 @@ EAPI int E_EVENT_SLIPWIN_DEL = 0;
 
 E_Slipwin *_e_slipwin_new(E_Zone *zone, const char *themedir);
 static void _e_slipwin_free(E_Slipwin *ess);
-static int _e_slipwin_cb_animate(void *data);
+static Eina_Bool _e_slipwin_cb_animate(void *data);
 static void _e_slipwin_slide(E_Slipwin *ess, int out, double len);
-static int _e_slipwin_cb_mouse_up(void *data, int type, void *event);
-static int _e_slipwin_cb_zone_move_resize(void *data, int type, void *event);
-static int _e_slipwin_cb_zone_del(void *data, int type, void *event);
+static Eina_Bool _e_slipwin_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_slipwin_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_slipwin_cb_zone_del(void *data, int type, void *event);
 static void _e_slipwin_event_simple_free(void *data, void *ev);
 static void _e_slipwin_object_del_attach(void *o);
 static void _e_slipwin_cb_item_sel(void *data);
@@ -223,7 +223,7 @@ _e_slipwin_free(E_Slipwin *esw)
    free(esw);
 }
 
-static int
+static Eina_Bool
 _e_slipwin_cb_animate(void *data)
 {
    E_Slipwin *esw;
@@ -262,9 +262,9 @@ _e_slipwin_cb_animate(void *data)
 	     e_widget_ilist_clear(esw->ilist_obj);
 	     e_widget_ilist_thaw(esw->ilist_obj);
 	  }
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -298,8 +298,8 @@ _e_slipwin_slide(E_Slipwin *esw, int out, double len)
      }
 }
 
-static int
-_e_slipwin_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_slipwin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Slipwin *esw;
@@ -311,11 +311,11 @@ _e_slipwin_cb_mouse_up(void *data, int type, void *event)
 	if (esw->out) _e_slipwin_slide(esw, 0, 1.0);
 	else _e_slipwin_slide(esw, 1, 1.0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_slipwin_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_slipwin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    E_Slipwin *esw;
@@ -326,11 +326,11 @@ _e_slipwin_cb_zone_move_resize(void *data, int type, void *event)
      {
 	/* FIXME: handle new size pants */
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_slipwin_cb_zone_del(void *data, int type, void *event)
+static Eina_Bool
+_e_slipwin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Del *ev;
    E_Slipwin *esw;
@@ -341,7 +341,7 @@ _e_slipwin_cb_zone_del(void *data, int type, void *event)
      {
 	e_object_del(E_OBJECT(esw));
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 				       
 static void
diff --git a/src/modules/illume/e_syswin.c b/src/modules/illume/e_syswin.c
index ff7e568e5..468ea89ac 100644
--- a/src/modules/illume/e_syswin.c
+++ b/src/modules/illume/e_syswin.c
@@ -16,11 +16,11 @@ EAPI int E_EVENT_SYSWIN_DEL = 0;
 
 E_Syswin *_e_syswin_new(E_Zone *zone, const char *themedir);
 static void _e_syswin_free(E_Syswin *ess);
-static int _e_syswin_cb_animate(void *data);
+static Eina_Bool _e_syswin_cb_animate(void *data);
 static void _e_syswin_slide(E_Syswin *ess, int out, double len);
-static int _e_syswin_cb_mouse_up(void *data, int type, void *event);
-static int _e_syswin_cb_zone_move_resize(void *data, int type, void *event);
-static int _e_syswin_cb_zone_del(void *data, int type, void *event);
+static Eina_Bool _e_syswin_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_syswin_cb_zone_move_resize(void *data, int type, void *event);
+static Eina_Bool _e_syswin_cb_zone_del(void *data, int type, void *event);
 static void _e_syswin_event_simple_free(void *data, void *ev);
 static void _e_syswin_object_del_attach(void *o);
 static void _e_syswin_cb_item_sel(void *data);
@@ -223,7 +223,7 @@ _e_syswin_free(E_Syswin *esw)
    free(esw);
 }
 
-static int
+static Eina_Bool
 _e_syswin_cb_animate(void *data)
 {
    E_Syswin *esw;
@@ -262,9 +262,9 @@ _e_syswin_cb_animate(void *data)
 	     e_widget_ilist_clear(esw->ilist_obj);
 	     e_widget_ilist_thaw(esw->ilist_obj);
 	  }
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void
@@ -298,8 +298,8 @@ _e_syswin_slide(E_Syswin *esw, int out, double len)
      }
 }
 
-static int
-_e_syswin_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_syswin_cb_mouse_up(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    E_Syswin *esw;
@@ -311,11 +311,11 @@ _e_syswin_cb_mouse_up(void *data, int type, void *event)
 	if (esw->out) _e_syswin_slide(esw, 0, 1.0);
 	else _e_syswin_slide(esw, 1, 1.0);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_syswin_cb_zone_move_resize(void *data, int type, void *event)
+static Eina_Bool
+_e_syswin_cb_zone_move_resize(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Move_Resize *ev;
    E_Syswin *esw;
@@ -326,11 +326,11 @@ _e_syswin_cb_zone_move_resize(void *data, int type, void *event)
      {
 	/* FIXME: handle new size pants */
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_syswin_cb_zone_del(void *data, int type, void *event)
+static Eina_Bool
+_e_syswin_cb_zone_del(void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Zone_Del *ev;
    E_Syswin *esw;
@@ -341,7 +341,7 @@ _e_syswin_cb_zone_del(void *data, int type, void *event)
      {
 	e_object_del(E_OBJECT(esw));
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 				       
 static void
diff --git a/src/modules/illume/e_winilist.c b/src/modules/illume/e_winilist.c
index 31d889e88..81ec2e15c 100644
--- a/src/modules/illume/e_winilist.c
+++ b/src/modules/illume/e_winilist.c
@@ -42,12 +42,12 @@ static void _cb_object_resize(void *data, Evas *e, Evas_Object *obj, void *event
 
 static void _refill(Data *d);
 
-static int _cb_border_add(void *data, int ev_type, void *ev);
-static int _cb_border_remove(void *data, int ev_type, void *ev);
-static int _cb_border_show(void *data, int ev_type, void *ev);
-static int _cb_border_hide(void *data, int ev_type, void *ev);
-static int _cb_border_property(void *data, int ev_type, void *ev);
-static int _cb_desk_show(void *data, int ev_type, void *event);
+static Eina_Bool _cb_border_add(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_border_remove(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_border_show(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_border_hide(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_border_property(void *data, int ev_type, void *ev);
+static Eina_Bool _cb_desk_show(void *data, int ev_type, void *event);
 
 /* state */
 static Eina_List *handlers = NULL;
@@ -414,57 +414,57 @@ _refill(Data *d)
    d->optimal_size.h = lh + (h - vh);
 }
 
-static int
-_cb_border_add(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_border_add(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_border_remove(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_border_remove(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_border_show(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_border_show(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_border_hide(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_border_hide(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_border_property(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_border_property(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_desk_show(void *data, int ev_type, void *event)
+static Eina_Bool
+_cb_desk_show(__UNUSED__ void *data, __UNUSED__ int ev_type, __UNUSED__ void *event)
 {
    Eina_List *l;
 	
    for (l = winilists; l; l = l->next) _refill(l->data);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
diff --git a/src/modules/illume2/e_mod_config_animation.c b/src/modules/illume2/e_mod_config_animation.c
index dfb7012ff..d04590c60 100644
--- a/src/modules/illume2/e_mod_config_animation.c
+++ b/src/modules/illume2/e_mod_config_animation.c
@@ -6,7 +6,7 @@ static void *_e_mod_illume_config_animation_create(E_Config_Dialog *cfd);
 static void _e_mod_illume_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event);
-static int _e_mod_illume_config_animation_timeout(void *data);
+static Eina_Bool _e_mod_illume_config_animation_timeout(void *data);
 
 /* local variables */
 Ecore_Timer *_anim_change_timer = NULL;
@@ -118,10 +118,10 @@ _e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event)
      ecore_timer_add(0.5, _e_mod_illume_config_animation_timeout, data);
 }
 
-static int 
+static Eina_Bool
 _e_mod_illume_config_animation_timeout(void *data) 
 {
    e_config_save_queue();
    _anim_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/illume2/e_mod_config_policy.c b/src/modules/illume2/e_mod_config_policy.c
index 3d723466d..b49c36888 100644
--- a/src/modules/illume2/e_mod_config_policy.c
+++ b/src/modules/illume2/e_mod_config_policy.c
@@ -6,7 +6,7 @@ static void *_e_mod_illume_config_policy_create(E_Config_Dialog *cfd);
 static void _e_mod_illume_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _e_mod_illume_config_policy_list_changed(void *data);
-static int _e_mod_illume_config_policy_change_timeout(void *data);
+static Eina_Bool _e_mod_illume_config_policy_change_timeout(void *data);
 static Evas_Object *_e_mod_illume_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static Eina_List *_e_mod_illume_config_policy_policies_get(void);
 static void _e_mod_illume_config_policy_policy_free(E_Illume_Policy *p);
@@ -109,13 +109,13 @@ _e_mod_illume_config_policy_list_changed(void *data)
      ecore_timer_add(0.5, _e_mod_illume_config_policy_change_timeout, data);
 }
 
-static int 
+static Eina_Bool
 _e_mod_illume_config_policy_change_timeout(void *data) 
 {
    e_config_save_queue();
    _policy_change_timer = NULL;
    ecore_event_add(E_ILLUME_POLICY_EVENT_CHANGE, NULL, NULL, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static Eina_List *
diff --git a/src/modules/illume2/e_mod_config_windows.c b/src/modules/illume2/e_mod_config_windows.c
index 26fe54d47..bb4eee1f6 100644
--- a/src/modules/illume2/e_mod_config_windows.c
+++ b/src/modules/illume2/e_mod_config_windows.c
@@ -8,7 +8,7 @@ static void _e_mod_illume_config_windows_free(E_Config_Dialog *cfd, E_Config_Dia
 static Evas_Object *_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _e_mod_illume_config_windows_check_changed(void *data, Evas_Object *obj, void *event);
 static void _e_mod_illume_config_windows_change(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__);
-static int _e_mod_illume_config_windows_change_timeout(void *data __UNUSED__);
+static Eina_Bool _e_mod_illume_config_windows_change_timeout(void *data __UNUSED__);
 static void _e_mod_illume_config_windows_select_home(void *data __UNUSED__, void *data2 __UNUSED__);
 static void _e_mod_illume_config_windows_select_vkbd(void *data __UNUSED__, void *data2 __UNUSED__);
 static void _e_mod_illume_config_windows_select_softkey(void *data __UNUSED__, void *data2 __UNUSED__);
@@ -184,12 +184,12 @@ _e_mod_illume_config_windows_change(void *data, Evas_Object *obj __UNUSED__, voi
      ecore_timer_add(0.5, _e_mod_illume_config_windows_change_timeout, data);
 }
 
-static int 
+static Eina_Bool
 _e_mod_illume_config_windows_change_timeout(void *data __UNUSED__) 
 {
    e_config_save_queue();
    _windows_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
diff --git a/src/modules/illume2/e_mod_kbd.c b/src/modules/illume2/e_mod_kbd.c
index 9c0b75581..aaefdaa15 100644
--- a/src/modules/illume2/e_mod_kbd.c
+++ b/src/modules/illume2/e_mod_kbd.c
@@ -3,17 +3,17 @@
 #include "e_mod_kbd_device.h"
 
 /* local function prototypes */
-static int _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event);
 static void _e_mod_kbd_cb_border_pre_post_fetch(void *data __UNUSED__, void *data2);
 static void _e_mod_kbd_cb_free(E_Illume_Keyboard *kbd);
-static int _e_mod_kbd_cb_delay_hide(void *data __UNUSED__);
+static Eina_Bool _e_mod_kbd_cb_delay_hide(void *data __UNUSED__);
 static void _e_mod_kbd_hide(void);
 static void _e_mod_kbd_slide(int visible, double len);
-static int _e_mod_kbd_cb_animate(void *data __UNUSED__);
+static Eina_Bool _e_mod_kbd_cb_animate(void *data __UNUSED__);
 static E_Illume_Keyboard *_e_mod_kbd_by_border_get(E_Border *bd);
 static void _e_mod_kbd_border_adopt(E_Border *bd);
 static void _e_mod_kbd_layout_send(void);
@@ -217,13 +217,13 @@ e_mod_kbd_layout_set(E_Illume_Keyboard_Layout layout)
 }
 
 /* local functions */
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Client_Message *ev;
 
    ev = event;
-   if (ev->win != ecore_x_window_root_first_get()) return 1;
+   if (ev->win != ecore_x_window_root_first_get()) return ECORE_CALLBACK_PASS_ON;
 
    /* legacy illume 1 code */
    if ((ev->message_type == ecore_x_atom_get("_MB_IM_INVOKER_COMMAND")) || 
@@ -233,10 +233,10 @@ _e_mod_kbd_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *e
         else if (ev->data.l[0] == 2) e_mod_kbd_hide();
         else if (ev->data.l[0] == 3) e_mod_kbd_toggle();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Remove *ev;
@@ -250,11 +250,11 @@ _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *ev
         e_mod_kbd_hide();
         _focused_border = NULL;
         _focused_state = 0;
-        return 1;
+        return ECORE_CALLBACK_PASS_ON;
      }
 
    /* try to find the keyboard for this border */
-   if (!(kbd = _e_mod_kbd_by_border_get(ev->border))) return 1;
+   if (!(kbd = _e_mod_kbd_by_border_get(ev->border))) return ECORE_CALLBACK_PASS_ON;
 
    if ((kbd->border) && (kbd->border == ev->border)) 
      {
@@ -278,16 +278,16 @@ _e_mod_kbd_cb_border_remove(void *data __UNUSED__, int type __UNUSED__, void *ev
    else if (!kbd->border) 
      kbd->waiting_borders = eina_list_remove(kbd->waiting_borders, ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Focus_In *ev;
 
    ev = event;
-   if (_e_mod_kbd_by_border_get(ev->border)) return 1;
+   if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
 
 //   printf("Kbd Focus in: %s\n", ev->border->client.icccm.name);
 
@@ -300,16 +300,16 @@ _e_mod_kbd_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *
    else 
      e_mod_kbd_show();
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Focus_Out *ev;
 
    ev = event;
-   if (_e_mod_kbd_by_border_get(ev->border)) return 1;
+   if (_e_mod_kbd_by_border_get(ev->border)) return ECORE_CALLBACK_PASS_ON;
 
 //   printf("Kbd Focus Out: %s\n", ev->border->client.icccm.name);
 
@@ -332,10 +332,10 @@ _e_mod_kbd_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void
    _focused_border = NULL;
    _focused_state = 0;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Window_Property *ev;
@@ -345,15 +345,15 @@ _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *
    ev = event;
 
    /* only interested in vkbd state changes here */
-   if (ev->atom != ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) return 1;
+   if (ev->atom != ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) return ECORE_CALLBACK_PASS_ON;
 
    /* make sure we have a border */
-   if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
+   if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
 
 //   printf("Kbd Border Property Change: %s\n", bd->client.icccm.name);
 
    /* if it's not focused, we don't care */
-   if ((!bd->focused) || (_e_mod_kbd_by_border_get(bd))) return 1;
+   if ((!bd->focused) || (_e_mod_kbd_by_border_get(bd))) return ECORE_CALLBACK_PASS_ON;
 
    /* NB: Not sure why, but we seem to need to fetch kbd state here. This could 
     * be a result of filtering the container_hook_layout. Not real happy 
@@ -364,7 +364,7 @@ _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *
    if ((_focused_border) && (_focused_border == bd)) 
      {
         /* if focused state is the same, get out */
-        if (_focused_state == bd->client.vkbd.state) return 1;
+        if (_focused_state == bd->client.vkbd.state) return ECORE_CALLBACK_PASS_ON;
      }
 
    /* set our variables */
@@ -381,7 +381,7 @@ _e_mod_kbd_cb_border_property(void *data __UNUSED__, int type __UNUSED__, void *
    else 
      e_mod_kbd_show();
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
@@ -426,11 +426,11 @@ _e_mod_kbd_cb_free(E_Illume_Keyboard *kbd)
    E_FREE(kbd);
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_delay_hide(void *data __UNUSED__) 
 {
    _e_mod_kbd_hide();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
@@ -481,7 +481,7 @@ _e_mod_kbd_slide(int visible, double len)
      _e_illume_kbd->animator = ecore_animator_add(_e_mod_kbd_cb_animate, NULL);
 }
 
-static int 
+static Eina_Bool
 _e_mod_kbd_cb_animate(void *data __UNUSED__) 
 {
    double t, v;
@@ -523,10 +523,10 @@ _e_mod_kbd_cb_animate(void *data __UNUSED__)
 
         _e_mod_kbd_changes_send();
 
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static E_Illume_Keyboard *
diff --git a/src/modules/illume2/e_mod_policy.c b/src/modules/illume2/e_mod_policy.c
index 4531ae41d..7d43edf39 100644
--- a/src/modules/illume2/e_mod_policy.c
+++ b/src/modules/illume2/e_mod_policy.c
@@ -7,15 +7,15 @@ static int _e_mod_policy_load(char *file);
 static void _e_mod_policy_handlers_add(void);
 static void _e_mod_policy_hooks_add(void);
 static void _e_mod_policy_cb_free(E_Illume_Policy *p);
-static int _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UNUSED__);
+static Eina_Bool _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UNUSED__);
 static void _e_mod_policy_cb_hook_post_fetch(void *data __UNUSED__, void *data2);
 static void _e_mod_policy_cb_hook_post_assign(void *data __UNUSED__, void *data2);
 static void _e_mod_policy_cb_hook_layout(void *data __UNUSED__, void *data2 __UNUSED__);
@@ -308,7 +308,7 @@ _e_mod_policy_cb_free(E_Illume_Policy *p)
    E_FREE(p);
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Add *ev;
@@ -317,10 +317,10 @@ _e_mod_policy_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *ev
    if ((_policy) && (_policy->funcs.border_add))
      _policy->funcs.border_add(ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Remove *ev;
@@ -329,10 +329,10 @@ _e_mod_policy_cb_border_del(void *data __UNUSED__, int type __UNUSED__, void *ev
    if ((_policy) && (_policy->funcs.border_del))
      _policy->funcs.border_del(ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Focus_In *ev;
@@ -341,10 +341,10 @@ _e_mod_policy_cb_border_focus_in(void *data __UNUSED__, int type __UNUSED__, voi
    if ((_policy) && (_policy->funcs.border_focus_in))
      _policy->funcs.border_focus_in(ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Focus_Out *ev;
@@ -353,10 +353,10 @@ _e_mod_policy_cb_border_focus_out(void *data __UNUSED__, int type __UNUSED__, vo
    if ((_policy) && (_policy->funcs.border_focus_out))
      _policy->funcs.border_focus_out(ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Show *ev;
@@ -365,10 +365,10 @@ _e_mod_policy_cb_border_show(void *data __UNUSED__, int type __UNUSED__, void *e
    if ((_policy) && (_policy->funcs.border_show))
      _policy->funcs.border_show(ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Zone_Move_Resize *ev;
@@ -377,10 +377,10 @@ _e_mod_policy_cb_zone_move_resize(void *data __UNUSED__, int type __UNUSED__, vo
    if ((_policy) && (_policy->funcs.zone_move_resize))
      _policy->funcs.zone_move_resize(ev->zone);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Client_Message *ev;
@@ -390,7 +390,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Border *bd;
 
-        if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
+        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.border_activate))
           _policy->funcs.border_activate(bd);
      }
@@ -398,7 +398,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Zone *zone;
 
-        if (!(zone = e_util_zone_window_find(ev->win))) return 1;
+        if (!(zone = e_util_zone_window_find(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.zone_mode_change))
           _policy->funcs.zone_mode_change(zone, ev->data.l[0]);
      }
@@ -406,7 +406,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Zone *zone;
 
-        if (!(zone = e_util_zone_window_find(ev->win))) return 1;
+        if (!(zone = e_util_zone_window_find(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.zone_close))
           _policy->funcs.zone_close(zone);
      }
@@ -414,7 +414,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Zone *zone;
 
-        if (!(zone = e_util_zone_window_find(ev->win))) return 1;
+        if (!(zone = e_util_zone_window_find(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.focus_back))
           _policy->funcs.focus_back(zone);
      }
@@ -422,7 +422,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Zone *zone;
 
-        if (!(zone = e_util_zone_window_find(ev->win))) return 1;
+        if (!(zone = e_util_zone_window_find(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.focus_forward))
           _policy->funcs.focus_forward(zone);
      }
@@ -430,7 +430,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Zone *zone;
 
-        if (!(zone = e_util_zone_window_find(ev->win))) return 1;
+        if (!(zone = e_util_zone_window_find(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.focus_home))
           _policy->funcs.focus_home(zone);
      }
@@ -438,7 +438,7 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Border *bd;
 
-        if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
+        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.drag_start))
           _policy->funcs.drag_start(bd);
      }
@@ -446,15 +446,15 @@ _e_mod_policy_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void
      {
         E_Border *bd;
 
-        if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
+        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
         if ((_policy) && (_policy->funcs.drag_end))
           _policy->funcs.drag_end(bd);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Window_Property *ev;
@@ -463,25 +463,25 @@ _e_mod_policy_cb_window_property(void *data __UNUSED__, int type __UNUSED__, voi
    if ((_policy) && (_policy->funcs.property_change))
      _policy->funcs.property_change(ev);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_policy_cb_policy_change(void *data __UNUSED__, int type, void *event __UNUSED__) 
 {
    char *file;
 
-   if (type != E_ILLUME_POLICY_EVENT_CHANGE) return 1;
+   if (type != E_ILLUME_POLICY_EVENT_CHANGE) return ECORE_CALLBACK_PASS_ON;
 
    /* find policy specified in config */
-   if (!(file = _e_mod_policy_find())) return 1;
+   if (!(file = _e_mod_policy_find())) return ECORE_CALLBACK_PASS_ON;
 
    /* try to load the policy */
    _e_mod_policy_load(file);
 
    if (file) free(file);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
diff --git a/src/modules/illume2/e_mod_quickpanel.c b/src/modules/illume2/e_mod_quickpanel.c
index 58b6e038f..b20cabcfa 100644
--- a/src/modules/illume2/e_mod_quickpanel.c
+++ b/src/modules/illume2/e_mod_quickpanel.c
@@ -2,16 +2,16 @@
 #include "e_mod_quickpanel.h"
 
 /* local function prototypes */
-static int _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event);
-static int _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
-static int _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event);
+static Eina_Bool _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event);
 static void _e_mod_quickpanel_cb_post_fetch(void *data __UNUSED__, void *data2);
 static void _e_mod_quickpanel_cb_free(E_Illume_Quickpanel *qp);
-static int _e_mod_quickpanel_cb_delay_hide(void *data);
+static Eina_Bool _e_mod_quickpanel_cb_delay_hide(void *data);
 static void _e_mod_quickpanel_slide(E_Illume_Quickpanel *qp, int visible, double len);
 static void _e_mod_quickpanel_hide(E_Illume_Quickpanel *qp);
-static int _e_mod_quickpanel_cb_animate(void *data);
+static Eina_Bool _e_mod_quickpanel_cb_animate(void *data);
 static void _e_mod_quickpanel_position_update(E_Illume_Quickpanel *qp);
 static void _e_mod_quickpanel_animate_down(E_Illume_Quickpanel *qp);
 static void _e_mod_quickpanel_animate_up(E_Illume_Quickpanel *qp);
@@ -150,7 +150,7 @@ e_mod_quickpanel_hide(E_Illume_Quickpanel *qp)
 }
 
 /* local functions */
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    Ecore_X_Event_Client_Message *ev;
@@ -195,15 +195,15 @@ _e_mod_quickpanel_cb_client_message(void *data __UNUSED__, int type __UNUSED__,
         E_Border *bd;
         E_Illume_Quickpanel *qp;
 
-        if (!(bd = e_border_find_by_client_window(ev->win))) return 1;
-        if (!(qp = e_illume_quickpanel_by_zone_get(bd->zone))) return 1;
+        if (!(bd = e_border_find_by_client_window(ev->win))) return ECORE_CALLBACK_PASS_ON;
+        if (!(qp = e_illume_quickpanel_by_zone_get(bd->zone))) return ECORE_CALLBACK_PASS_ON;
         _e_mod_quickpanel_position_update(qp);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event) 
 {
    Ecore_Event_Mouse_Button *ev;
@@ -211,12 +211,12 @@ _e_mod_quickpanel_cb_mouse_up(void *data, int type __UNUSED__, void *event)
 
    ev = event;
    qp = data;
-   if (ev->event_window != qp->clickwin) return 1;
+   if (ev->event_window != qp->clickwin) return ECORE_CALLBACK_PASS_ON;
    if (qp->visible) e_mod_quickpanel_hide(qp);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Add *ev;
@@ -225,7 +225,7 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
    int iy;
 
    ev = event;
-   if (!ev->border->client.illume.quickpanel.quickpanel) return 1;
+   if (!ev->border->client.illume.quickpanel.quickpanel) return ECORE_CALLBACK_PASS_ON;
 
    zone = ev->border->zone;
 
@@ -242,7 +242,7 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
         if (!zone) zone = e_util_container_zone_number_get(con->num, 0);
      }
 
-   if (!(qp = e_illume_quickpanel_by_zone_get(zone))) return 1;
+   if (!(qp = e_illume_quickpanel_by_zone_get(zone))) return ECORE_CALLBACK_PASS_ON;
 
    /* set position and zone */
    e_illume_border_indicator_pos_get(zone, NULL, &iy);
@@ -259,10 +259,10 @@ _e_mod_quickpanel_cb_border_add(void *data __UNUSED__, int type __UNUSED__, void
    /* add this border to QP border collection */
    qp->borders = eina_list_append(qp->borders, ev->border);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, void *event) 
 {
    E_Event_Border_Resize *ev;
@@ -271,14 +271,14 @@ _e_mod_quickpanel_cb_border_resize(void *data __UNUSED__, int type __UNUSED__, v
    E_Border *bd;
 
    ev = event;
-   if (!ev->border->client.illume.quickpanel.quickpanel) return 1;
-   if (!(qp = e_illume_quickpanel_by_zone_get(ev->border->zone))) return 1;
+   if (!ev->border->client.illume.quickpanel.quickpanel) return ECORE_CALLBACK_PASS_ON;
+   if (!(qp = e_illume_quickpanel_by_zone_get(ev->border->zone))) return ECORE_CALLBACK_PASS_ON;
 
    qp->h = 0;
    EINA_LIST_FOREACH(qp->borders, l, bd)
      qp->h += bd->h;
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void 
@@ -320,14 +320,14 @@ _e_mod_quickpanel_cb_free(E_Illume_Quickpanel *qp)
    E_FREE(qp);
 }
 
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_delay_hide(void *data) 
 {
    E_Illume_Quickpanel *qp;
 
-   if (!(qp = data)) return 0;
+   if (!(qp = data)) return ECORE_CALLBACK_CANCEL;
    _e_mod_quickpanel_hide(qp);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
@@ -386,13 +386,13 @@ _e_mod_quickpanel_hide(E_Illume_Quickpanel *qp)
      _e_mod_quickpanel_slide(qp, 0, (double)duration / 1000.0);
 }
 
-static int 
+static Eina_Bool
 _e_mod_quickpanel_cb_animate(void *data) 
 {
    E_Illume_Quickpanel *qp;
    double t, v = 1.0;
 
-   if (!(qp = data)) return 0;
+   if (!(qp = data)) return ECORE_CALLBACK_CANCEL;
    t = (ecore_loop_time_get() - qp->start);
    if (t > qp->len) t = qp->len;
    if (qp->len > 0.0) 
@@ -423,10 +423,10 @@ _e_mod_quickpanel_cb_animate(void *data)
 	     qp->visible = 1;
 	     _e_mod_quickpanel_clickwin_show(qp);
 	  }
-        return 0;
+        return ECORE_CALLBACK_CANCEL;
      }
 
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static void 
diff --git a/src/modules/illume2/e_mod_select_window.c b/src/modules/illume2/e_mod_select_window.c
index 58f0a0cdc..cb44e0211 100644
--- a/src/modules/illume2/e_mod_select_window.c
+++ b/src/modules/illume2/e_mod_select_window.c
@@ -6,7 +6,7 @@ static void *_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd
 static void _e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
 static void _e_mod_illume_config_select_window_list_changed(void *data);
-static int _e_mod_illume_config_select_window_change_timeout(void *data);
+static Eina_Bool _e_mod_illume_config_select_window_change_timeout(void *data);
 static int _e_mod_illume_config_select_window_match(E_Border *bd);
 
 /* local variables */
@@ -144,12 +144,12 @@ _e_mod_illume_config_select_window_list_changed(void *data)
      ecore_timer_add(0.5, _e_mod_illume_config_select_window_change_timeout, data);
 }
 
-static int 
-_e_mod_illume_config_select_window_change_timeout(void *data) 
+static Eina_Bool
+_e_mod_illume_config_select_window_change_timeout(__UNUSED__ void *data)
 {
    e_config_save_queue();
    _sw_change_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static int 
diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index 093b3a21a..d64f256b4 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -117,11 +117,11 @@ _mixer_gadget_configuration_free_foreach(const Eina_Hash *hash __UNUSED__, const
    return 1;
 }
 
-static int
+static Eina_Bool
 _mixer_module_configuration_alert(void *data)
 {
    e_util_dialog_show(_("Mixer Settings Updated"), "%s", (char *)data);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static E_Mixer_Module_Config *
@@ -393,21 +393,21 @@ _mixer_app_cb_del(E_Dialog *dialog __UNUSED__, void *data)
 
 static void _mixer_popup_del(E_Mixer_Instance *inst);
 
-static int
+static Eina_Bool
 _mixer_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
    E_Mixer_Instance *inst = data;
 
    if (ev->window != inst->ui.input.win)
-      return 1;
+      return ECORE_CALLBACK_PASS_ON;
 
    _mixer_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -415,7 +415,7 @@ _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
    const char *keysym;
 
    if (ev->window != inst->ui.input.win)
-      return 1;
+      return ECORE_CALLBACK_PASS_ON;
 
    keysym = ev->key;
    if (strcmp(keysym, "Escape") == 0)
@@ -430,7 +430,7 @@ _mixer_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
    else
       _mixer_popup_del(inst); /* XXX really? */
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/mixer/sys_alsa.c b/src/modules/mixer/sys_alsa.c
index a72a8cfb9..df2cfb303 100644
--- a/src/modules/mixer/sys_alsa.c
+++ b/src/modules/mixer/sys_alsa.c
@@ -21,7 +21,7 @@ static int _mixer_callback_add(E_Mixer_System *self, int (*func)(void *data, E_M
 static int _mixer_callback_del(E_Mixer_System *self, struct e_mixer_callback_desc *desc);
 
 
-static int
+static Eina_Bool
 _cb_dispatch(void *data)
 {
    struct e_mixer_callback_desc *desc;
@@ -35,10 +35,10 @@ _cb_dispatch(void *data)
    if (!r)
      _mixer_callback_del(desc->self, desc); /* desc is invalid then. */
 
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
+static Eina_Bool
 _cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
    struct e_mixer_callback_desc *desc;
@@ -60,12 +60,12 @@ _cb_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
 	     _mixer_callback_del(s, desc);
 	     _mixer_callback_add(s, f, d);
 	  }
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    if (!desc->idler)
      desc->idler = ecore_idler_add(_cb_dispatch, desc);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 static int
diff --git a/src/modules/ofono/e_mod_main.c b/src/modules/ofono/e_mod_main.c
index 5c55f640a..ed28698c5 100644
--- a/src/modules/ofono/e_mod_main.c
+++ b/src/modules/ofono/e_mod_main.c
@@ -36,21 +36,21 @@ e_ofono_theme_path(void)
 
 static void _ofono_popup_del(E_Ofono_Instance *inst);
 
-static int
+static Eina_Bool
 _ofono_popup_input_window_mouse_up_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Mouse_Button *ev = event;
    E_Ofono_Instance *inst = data;
 
    if (ev->window != inst->ui.input.win)
-      return 1;
+      return ECORE_CALLBACK_PASS_ON;
 
    _ofono_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ofono_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *event)
 {
    Ecore_Event_Key *ev = event;
@@ -58,13 +58,13 @@ _ofono_popup_input_window_key_down_cb(void *data, int type __UNUSED__, void *eve
    const char *keysym;
 
    if (ev->window != inst->ui.input.win)
-      return 1;
+      return ECORE_CALLBACK_PASS_ON;
 
    keysym = ev->key;
    if (!strcmp(keysym, "Escape"))
       _ofono_popup_del(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -530,13 +530,13 @@ static const E_Gadcon_Client_Class _gc_class =
 
 EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_ofono_Name};
 
-static int
+static Eina_Bool
 _ofono_manager_changed_do(void *data)
 {
    E_Ofono_Module_Context *ctxt = data;
 
    ctxt->poller.manager_changed = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -549,7 +549,7 @@ _ofono_manager_changed(void *data, const E_Ofono_Element *element __UNUSED__)
      (ECORE_POLLER_CORE, 1, _ofono_manager_changed_do, ctxt);
 }
 
-static int
+static Eina_Bool
 _ofono_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Ofono_Element *element;
@@ -567,10 +567,10 @@ _ofono_event_manager_in(void *data, int type __UNUSED__, void *event __UNUSED__)
    EINA_LIST_FOREACH(ctxt->instances, l, inst)
        _ofono_gadget_update(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _ofono_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__)
 {
    E_Ofono_Module_Context *ctxt = data;
@@ -584,10 +584,10 @@ _ofono_event_manager_out(void *data, int type __UNUSED__, void *event __UNUSED__
    EINA_LIST_FOREACH(ctxt->instances, l, inst)
       _ofono_gadget_update(inst);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _eofono_event_element_add(void *data, int type __UNUSED__, void *info)
 {
    E_Ofono_Element *element = info;
@@ -619,7 +619,7 @@ _eofono_event_element_add(void *data, int type __UNUSED__, void *info)
 
    /* if still orphan, do nothing */
    if (!have_inst)
-     return ECORE_CALLBACK_RENEW;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (e_ofono_element_is_modem(element))
      inst->modem_element = element;
@@ -628,10 +628,10 @@ _eofono_event_element_add(void *data, int type __UNUSED__, void *info)
 
    _ofono_gadget_update(inst);
 
-   return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _eofono_event_element_del(void *data, int type __UNUSED__, void *info)
 {
    E_Ofono_Element *element = info;
@@ -650,7 +650,7 @@ _eofono_event_element_del(void *data, int type __UNUSED__, void *info)
 	}
 
    if (!inst_found)
-     return ECORE_CALLBACK_RENEW;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (e_ofono_element_is_modem(element))
      {
@@ -668,10 +668,10 @@ _eofono_event_element_del(void *data, int type __UNUSED__, void *info)
 
    _ofono_gadget_update(inst);
 
-   return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _eofono_event_element_updated(void *data, int type __UNUSED__, void *event_info)
 {
    E_Ofono_Element *element = event_info;
@@ -691,7 +691,7 @@ _eofono_event_element_updated(void *data, int type __UNUSED__, void *event_info)
 	}
 
    if (!inst_found)
-     return ECORE_CALLBACK_RENEW;
+     return ECORE_CALLBACK_PASS_ON;
 
    if (e_ofono_element_is_modem(element))
      {
@@ -725,7 +725,7 @@ _eofono_event_element_updated(void *data, int type __UNUSED__, void *event_info)
 
    _ofono_gadget_update(inst);
 
-   return ECORE_CALLBACK_RENEW;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/pager/e_mod_config.c b/src/modules/pager/e_mod_config.c
index f77a7324e..47ee1e589 100644
--- a/src/modules/pager/e_mod_config.c
+++ b/src/modules/pager/e_mod_config.c
@@ -44,8 +44,8 @@ static int _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfd
 static int _adv_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata);
 static void _update_btn_lbl(E_Config_Dialog_Data *cfdata);
 static void _grab_window_show(void *data1, void *data2);
-static int _grab_cb_mouse_down(void *data, int type, void *event);
-static int _grab_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _grab_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _grab_cb_key_down(void *data, int type, void *event);
 static void _grab_window_hide(E_Config_Dialog_Data *cfdata);
 static void _cb_disable_check_list(void *data, Evas_Object *obj);
 
@@ -386,15 +386,15 @@ _grab_window_show(void *data1, void *data2)
                                    pager_config->config_dialog->dia->win->evas_win);
 }
 
-static int
-_grab_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_grab_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Ecore_Event_Mouse_Button *ev;
 
    ev = event;
-   if (!(cfdata = data)) return 1;
-   if (ev->window != cfdata->grab.bind_win) return 1;
+   if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->window != cfdata->grab.bind_win) return ECORE_CALLBACK_PASS_ON;
 
    if (ev->buttons == cfdata->btn.drag)
      cfdata->btn.drag = 0;
@@ -419,18 +419,18 @@ _grab_cb_mouse_down(void *data, int type, void *event)
                              "This button only works in the Popup"));
      }
    _grab_window_hide(cfdata);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_grab_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_grab_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Config_Dialog_Data *cfdata = NULL;
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (!(cfdata = data)) return 1;
-   if (ev->window != cfdata->grab.bind_win) return 1;
+   if (!(cfdata = data)) return ECORE_CALLBACK_PASS_ON;
+   if (ev->window != cfdata->grab.bind_win) return ECORE_CALLBACK_PASS_ON;
    if (!strcmp(ev->keyname, "Escape")) _grab_window_hide(cfdata);
    if (!strcmp(ev->keyname, "Delete"))
      {
@@ -442,7 +442,7 @@ _grab_cb_key_down(void *data, int type, void *event)
           cfdata->btn.desk = 0;
         _grab_window_hide(cfdata);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c
index 97b99f820..4dc9eccbd 100644
--- a/src/modules/pager/e_mod_main.c
+++ b/src/modules/pager/e_mod_main.c
@@ -107,25 +107,25 @@ static void _menu_cb_post(void *data, E_Menu *m);
 static void _pager_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _pager_inst_cb_menu_virtual_desktops_dialog(void *data, E_Menu *m, E_Menu_Item *mi);
 static void _pager_instance_drop_zone_recalc(Instance *inst);
-static int _pager_cb_event_border_resize(void *data, int type, void *event);
-static int _pager_cb_event_border_move(void *data, int type, void *event);
-static int _pager_cb_event_border_add(void *data, int type, void *event);
-static int _pager_cb_event_border_remove(void *data, int type, void *event);
-static int _pager_cb_event_border_iconify(void *data, int type, void *event);
-static int _pager_cb_event_border_uniconify(void *data, int type, void *event);
-static int _pager_cb_event_border_stick(void *data, int type, void *event);
-static int _pager_cb_event_border_unstick(void *data, int type, void *event);
-static int _pager_cb_event_border_desk_set(void *data, int type, void *event);
-static int _pager_cb_event_border_stack(void *data, int type, void *event);
-static int _pager_cb_event_border_icon_change(void *data, int type, void *event);
-static int _pager_cb_event_border_urgent_change(void *data, int type, void *event);
-static int _pager_cb_event_border_focus_in(void *data, int type, void *event);
-static int _pager_cb_event_border_focus_out(void *data, int type, void *event);
-static int _pager_cb_event_border_property(void *data, int type, void *event);
-static int _pager_cb_event_zone_desk_count_set(void *data, int type, void *event);
-static int _pager_cb_event_desk_show(void *data, int type, void *event);
-static int _pager_cb_event_desk_name_change(void *data, int type, void *event);
-static int _pager_cb_event_container_resize(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_resize(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_move(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_add(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_remove(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_iconify(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_uniconify(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_stick(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_unstick(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_desk_set(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_stack(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_icon_change(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_urgent_change(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_focus_in(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_focus_out(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_border_property(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_zone_desk_count_set(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_desk_show(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_desk_name_change(void *data, int type, void *event);
+static Eina_Bool _pager_cb_event_container_resize(void *data, int type, void *event);
 static void _pager_window_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _pager_window_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _pager_window_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
@@ -142,7 +142,7 @@ static void _pager_desk_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void
 static void _pager_desk_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _pager_desk_cb_drag_finished(E_Drag *drag, int dropped);
 static void _pager_desk_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int _pager_popup_cb_timeout(void *data);
+static Eina_Bool _pager_popup_cb_timeout(void *data);
 static Pager *_pager_new(Evas *evas, E_Zone *zone);
 static void _pager_free(Pager *p);
 static void _pager_fill(Pager *p);
@@ -166,14 +166,14 @@ static E_Config_Dialog *_pager_config_dialog(E_Container *con, const char *param
 /* functions for pager popup on key actions */
 static int _pager_popup_show();
 static void _pager_popup_hide(int switch_desk);
-static int _pager_popup_cb_mouse_down(void *data, int type, void *event);
-static int _pager_popup_cb_mouse_up(void *data, int type, void *event);
-static int _pager_popup_cb_mouse_move(void *data, int type, void *event);
-static int _pager_popup_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_mouse_wheel(void *data, int type, void *event);
 static void _pager_popup_desk_switch(int x, int y);
 static void _pager_popup_modifiers_set(int mod);
-static int _pager_popup_cb_key_down(void *data, int type, void *event);
-static int _pager_popup_cb_key_up(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _pager_popup_cb_key_up(void *data, int type, void *event);
 static void _pager_popup_cb_action_show(E_Object *obj, const char *params, Ecore_Event_Key *ev);
 static void _pager_popup_cb_action_switch(E_Object *obj, const char *params, Ecore_Event_Key *ev);
 
@@ -880,8 +880,8 @@ _pager_cb_config_updated(void)
    if (!pager_config) return;
 }
 
-static int
-_pager_cb_event_border_resize(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Resize *ev;
    Eina_List *l, *l2;
@@ -902,11 +902,11 @@ _pager_cb_event_border_resize(void *data, int type, void *event)
 	     if (pw) _pager_window_move(pw);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_move(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Move *ev;
    Eina_List *l, *l2;
@@ -937,11 +937,11 @@ _pager_cb_event_border_move(void *data, int type, void *event)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_add(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Add *ev;
    Eina_List *l;
@@ -961,11 +961,11 @@ _pager_cb_event_border_add(void *data, int type, void *event)
         pw = _pager_window_new(pd, ev->border);
         if (pw) pd->wins = eina_list_append(pd->wins, pw);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_remove(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Remove *ev;
    Eina_List *l, *l2;
@@ -987,11 +987,11 @@ _pager_cb_event_border_remove(void *data, int type, void *event)
              _pager_window_free(pw);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_iconify(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_iconify(__UNUSED__ void *data, __UNUSED__  type, void *event)
 {
    E_Event_Border_Iconify *ev;
    Eina_List *l, *l2;
@@ -1014,11 +1014,11 @@ _pager_cb_event_border_iconify(void *data, int type, void *event)
              evas_object_hide(pw->o_window);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_uniconify(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_uniconify(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Uniconify *ev;
    Eina_List *l, *l2;
@@ -1038,11 +1038,11 @@ _pager_cb_event_border_uniconify(void *data, int type, void *event)
 	     if ((pw) && (!pw->skip_winlist)) evas_object_show(pw->o_window);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_stick(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_stick(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Stick *ev;
    Eina_List *l, *l2;
@@ -1067,11 +1067,11 @@ _pager_cb_event_border_stick(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_unstick(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_unstick(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Unstick *ev;
    Eina_List *l, *l2;
@@ -1098,7 +1098,7 @@ _pager_cb_event_border_unstick(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -1221,8 +1221,8 @@ _pager_window_desk_change(Pager *pager, E_Border *bd)
      }
 }
 
-static int
-_pager_cb_event_border_desk_set(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_desk_set(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Desk_Set *ev;
    Eina_List *l;
@@ -1235,11 +1235,11 @@ _pager_cb_event_border_desk_set(void *data, int type, void *event)
 	_pager_window_desk_change(p, ev->border);
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_stack(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_stack(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Stack *ev;
    Eina_List *l, *l2;
@@ -1293,11 +1293,11 @@ _pager_cb_event_border_stack(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_icon_change(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_icon_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Icon_Change *ev;
    Eina_List *l, *l2;
@@ -1336,11 +1336,11 @@ _pager_cb_event_border_icon_change(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_urgent_change(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_urgent_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Urgent_Change *ev;
    Eina_List *l, *l2;
@@ -1405,11 +1405,11 @@ _pager_cb_event_border_urgent_change(void *data, int type, void *event)
 	  }
      }
  
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_border_focus_in(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_focus_in(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_In *ev;
    Eina_List *l, *l2;
@@ -1460,8 +1460,8 @@ _pager_cb_event_border_focus_in(void *data, int type, void *event)
    return 1;
 }
 
-static int
-_pager_cb_event_border_focus_out(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_focus_out(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Focus_Out *ev;
    Eina_List *l, *l2;
@@ -1512,8 +1512,8 @@ _pager_cb_event_border_focus_out(void *data, int type, void *event)
    return 1;
 }
 
-static int
-_pager_cb_event_border_property(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_border_property(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Border_Property *ev;
    Eina_List *l, *l2;
@@ -1542,7 +1542,7 @@ _pager_cb_event_border_property(void *data, int type, void *event)
 	       }
 	  }
      }
-   if (found) return 1;
+   if (found) return ECORE_CALLBACK_PASS_ON;
 
    /* If we did not find this window in the pager, then add it because
     * the skip_pager state may have changed to 1 */
@@ -1601,11 +1601,11 @@ _pager_cb_event_border_property(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_zone_desk_count_set(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_zone_desk_count_set(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Eina_List *l;
    Pager *p;
@@ -1617,11 +1617,11 @@ _pager_cb_event_zone_desk_count_set(void *data, int type, void *event)
 	_pager_fill(p);
 	if (p->inst) _gc_orient(p->inst->gcc, p->inst->gcc->gadcon->orient);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_desk_show(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_desk_show(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Desk_Show *ev;
    Eina_List *l;
@@ -1665,11 +1665,11 @@ _pager_cb_event_desk_show(void *data, int type, void *event)
 					 _pager_popup_cb_timeout, pp);
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_desk_name_change(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_desk_name_change(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Desk_Name_Change *ev;
    Eina_List *l;
@@ -1694,11 +1694,11 @@ _pager_cb_event_desk_name_change(void *data, int type, void *event)
                edje_object_part_text_set(pd->o_desk, "e.text.label", "");
           }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_cb_event_container_resize(void *data, int type, void *event)
+static Eina_Bool
+_pager_cb_event_container_resize(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    E_Event_Container_Resize *ev;
    Eina_List *l, *l2;
@@ -2338,7 +2338,7 @@ _pager_desk_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_in
      e_zone_desk_linear_flip_by(pd->desk->zone, ev->z);
 }
 
-static int
+static Eina_Bool
 _pager_popup_cb_timeout(void *data)
 {
    Pager_Popup *pp;
@@ -2352,8 +2352,8 @@ _pager_popup_cb_timeout(void *data)
 	e_grabinput_release(input_window, input_window);
 	input_window = 0;
      }
-   
-   return 0;
+
+   return ECORE_CALLBACK_CANCEL;
 }
 
 /************************************************************************/
@@ -2537,36 +2537,36 @@ _pager_popup_cb_action_switch(E_Object *obj, const char *params, Ecore_Event_Key
    _pager_popup_desk_switch(x, y);
 }
 
-static int
-_pager_popup_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    Pager_Popup *pp = act_popup;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
 
    evas_event_feed_mouse_down(pp->popup->evas, ev->buttons,
 			      0, ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_popup_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    Pager_Popup *pp = act_popup;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
 
    evas_event_feed_mouse_up(pp->popup->evas, ev->buttons,
 			    0, ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_popup_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
    Pager_Popup *pp = act_popup;
@@ -2578,11 +2578,11 @@ _pager_popup_cb_mouse_move(void *data, int type, void *event)
 			      ev->x - pp->popup->x + pp->pager->zone->x,
 			      ev->y - pp->popup->y + pp->pager->zone->y,
 			      ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_popup_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev = event;
    Pager_Popup *pp = act_popup;
@@ -2597,16 +2597,16 @@ _pager_popup_cb_mouse_wheel(void *data, int type, void *event)
    else
      _pager_popup_desk_switch(ev->z, 0);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_popup_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
    if (!strcmp(ev->key, "Up"))
      _pager_popup_desk_switch(0, -1);
    else if (!strcmp(ev->key, "Down"))
@@ -2655,16 +2655,16 @@ _pager_popup_cb_key_down(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_pager_popup_cb_key_up(void *data, int type, void *event)
+static Eina_Bool
+_pager_popup_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (!(act_popup)) return 1;
+   if (!(act_popup)) return ECORE_CALLBACK_PASS_ON;
 
    if (hold_mod)
      {
@@ -2701,11 +2701,11 @@ _pager_popup_cb_key_up(void *data, int type, void *event)
 	if ((hold_count <= 0) && (!act_popup->pager->dragging))
 	  {
 	     _pager_popup_hide(1);
-	     return 1;
+	     return ECORE_CALLBACK_PASS_ON;
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 /***************************************************************************/
diff --git a/src/modules/syscon/e_mod_main.c b/src/modules/syscon/e_mod_main.c
index 836a70885..e009b7c77 100644
--- a/src/modules/syscon/e_mod_main.c
+++ b/src/modules/syscon/e_mod_main.c
@@ -6,7 +6,7 @@
 
 /* actual module specifics */
 static void  _e_mod_action_syscon_cb(E_Object *obj, const char *params);
-static int   _e_mod_syscon_defer_cb(void *data);
+static Eina_Bool   _e_mod_syscon_defer_cb(void *data);
 static void  _e_mod_syscon_cb(void *data, E_Menu *m, E_Menu_Item *mi);
 static void  _e_mod_menu_add(void *data, E_Menu *m);
 
@@ -96,14 +96,14 @@ _e_mod_action_syscon_cb(E_Object *obj, const char *params)
 }
 
 /* menu item callback(s) */
-static int
+static Eina_Bool
 _e_mod_syscon_defer_cb(void *data)
 {
    E_Zone *zone;
 
    zone = data;
    if (zone) e_syscon_show(zone, NULL);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void 
diff --git a/src/modules/syscon/e_syscon.c b/src/modules/syscon/e_syscon.c
index 1d0aa17f8..217ac8b29 100644
--- a/src/modules/syscon/e_syscon.c
+++ b/src/modules/syscon/e_syscon.c
@@ -5,16 +5,16 @@
 #include "e_mod_main.h"
 
 /* local subsystem functions */
-static int _cb_key_down(void *data, int type, void *event);
-static int _cb_mouse_down(void *data, int type, void *event);
-static int _cb_mouse_up(void *data, int type, void *event);
-static int _cb_mouse_move(void *data, int type, void *event);
-static int _cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _cb_key_down(void *data, int type, void *event);
+static Eina_Bool _cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _cb_mouse_wheel(void *data, int type, void *event);
 static void _cb_signal_close(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _cb_signal_syscon(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _cb_signal_action(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _cb_signal_action_extra(void *data, Evas_Object *obj, const char *emission, const char *source);
-static int _cb_timeout_defaction(void *data);
+static Eina_Bool _cb_timeout_defaction(void *data);
 
 /* local subsystem globals */
 static E_Popup *popup = NULL;
@@ -307,13 +307,13 @@ e_syscon_hide(void)
 }
 
 /* local subsystem functions */
-static int
-_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (ev->event_window != input_window) return ECORE_CALLBACK_PASS_ON;
    if (!strcmp(ev->key, "Escape"))
      e_syscon_hide();
    else if (!strcmp(ev->key, "Up"))
@@ -321,48 +321,48 @@ _cb_key_down(void *data, int type, void *event)
         // FIXME: implement focus and key control... eventually
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
    Evas_Button_Flags flags = EVAS_BUTTON_NONE;
 
    ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (ev->event_window != input_window) return ECORE_CALLBACK_PASS_ON;
    if (ev->double_click) flags |= EVAS_BUTTON_DOUBLE_CLICK;
    if (ev->triple_click) flags |= EVAS_BUTTON_TRIPLE_CLICK;
    if ((ev->x < popup->x) || (ev->x >= (popup->x + popup->w)) ||
        (ev->y < popup->y) || (ev->y >= (popup->y + popup->h)))
      {
         e_syscon_hide();
-        return 1;
+        return ECORE_CALLBACK_PASS_ON;
      }
    evas_event_feed_mouse_down(popup->evas, ev->buttons, flags, ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
 
    ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (ev->event_window != input_window) return ECORE_CALLBACK_PASS_ON;
    evas_event_feed_mouse_up(popup->evas, ev->buttons, EVAS_BUTTON_NONE,
                             ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
 
    ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (ev->event_window != input_window) return ECORE_CALLBACK_PASS_ON;
    if (!inevas)
      {
         evas_event_feed_mouse_in(popup->evas, ev->timestamp, NULL);
@@ -370,19 +370,19 @@ _cb_mouse_move(void *data, int type, void *event)
      }
    evas_event_feed_mouse_move(popup->evas, ev->x - popup->x, ev->y - popup->y,
                               ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
 
    ev = event;
-   if (ev->event_window != input_window) return 1;
+   if (ev->event_window != input_window) return ECORE_CALLBACK_PASS_ON;
    evas_event_feed_mouse_wheel(popup->evas, ev->direction, ev->z, 
                                ev->timestamp, NULL);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
@@ -445,12 +445,12 @@ _cb_signal_action_extra(void *data, Evas_Object *obj, const char *emission, cons
    if (sca->func) sca->func((void *)sca->data);
 }
 
-static int
+static Eina_Bool
 _cb_timeout_defaction(void *data)
 {
    deftimer = NULL;
-   if (!do_defact) return 0;
+   if (!do_defact) return ECORE_CALLBACK_CANCEL;
    e_syscon_hide();
    _do_action_name(do_defact);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index 0c661e704..907d609ed 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -544,7 +544,7 @@ _systray_activate(Instance *inst)
    return 1;
 }
 
-static int
+static Eina_Bool
 _systray_activate_retry(void *data)
 {
    Instance *inst = data;
@@ -559,10 +559,10 @@ _systray_activate_retry(void *data)
 	     RETRY_TIMEOUT);
 
    if (!ret)
-     return 1;
+     return ECORE_CALLBACK_RENEW;
 
    inst->timer.retry = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -573,7 +573,7 @@ _systray_retry(Instance *inst)
      (RETRY_TIMEOUT, _systray_activate_retry, inst);
 }
 
-static int
+static Eina_Bool
 _systray_activate_retry_first(void *data)
 {
    Instance *inst = data;
@@ -585,7 +585,7 @@ _systray_activate_retry_first(void *data)
      {
 	fputs("SYSTRAY: activate success!\n", stderr);
 	inst->timer.retry = NULL;
-	return 0;
+	return ECORE_CALLBACK_CANCEL;
      }
 
    edje_object_signal_emit(inst->ui.gadget, _sig_disable, _sig_source);
@@ -595,7 +595,7 @@ _systray_activate_retry_first(void *data)
 
    inst->timer.retry = NULL;
    _systray_retry(inst);
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -695,7 +695,7 @@ _systray_handle_xembed(Instance *inst __UNUSED__, Ecore_X_Event_Client_Message *
      }
 }
 
-static int
+static Eina_Bool
 _systray_cb_client_message(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Client_Message *ev = event;
@@ -708,10 +708,10 @@ _systray_cb_client_message(void *data, int type __UNUSED__, void *event)
    else if (ev->message_type == _atom_xembed)
      _systray_handle_xembed(inst, ev);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _systray_cb_window_destroy(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Window_Destroy *ev = event;
@@ -726,10 +726,10 @@ _systray_cb_window_destroy(void *data, int type __UNUSED__, void *event)
 	  break;
        }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _systray_cb_window_show(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Window_Show *ev = event;
@@ -744,10 +744,10 @@ _systray_cb_window_show(void *data, int type __UNUSED__, void *event)
 	  break;
        }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _systray_cb_window_configure(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Window_Configure *ev = event;
@@ -762,10 +762,10 @@ _systray_cb_window_configure(void *data, int type __UNUSED__, void *event)
 	  break;
        }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _systray_cb_reparent_notify(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Window_Reparent *ev = event;
@@ -780,10 +780,10 @@ _systray_cb_reparent_notify(void *data, int type __UNUSED__, void *event)
 	  break;
        }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
+static Eina_Bool
 _systray_cb_selection_clear(void *data, int type __UNUSED__, void *event)
 {
    Ecore_X_Event_Selection_Clear *ev = event;
@@ -803,7 +803,7 @@ _systray_cb_selection_clear(void *data, int type __UNUSED__, void *event)
 	inst->win.base = None;
 	_systray_retry(inst);
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
 static void
diff --git a/src/modules/temperature/e_mod_main.h b/src/modules/temperature/e_mod_main.h
index 202c59eb2..c97aa184d 100644
--- a/src/modules/temperature/e_mod_main.h
+++ b/src/modules/temperature/e_mod_main.h
@@ -62,7 +62,7 @@ typedef enum _Backend
    UDEV
 } Backend;
 
-int temperature_udev_update_poll(void *data);
+Eina_Bool temperature_udev_update_poll(void *data);
 void temperature_udev_update(void *data);
 #endif
 
@@ -72,8 +72,8 @@ EAPI void *e_modapi_init(E_Module *m);
 EAPI int e_modapi_shutdown(E_Module *m);
 EAPI int e_modapi_save(E_Module *m);
 
-int _temperature_cb_exe_data(void *data, int type, void *event);
-int _temperature_cb_exe_del(void *data, int type, void *event);
+Eina_Bool _temperature_cb_exe_data(void *data, int type, void *event);
+Eina_Bool _temperature_cb_exe_del(void *data, int type, void *event);
 void _temperature_face_level_set(Config_Face *inst, double level);
 void config_temperature_module(Config_Face *inst);
 void temperature_face_update_config(Config_Face *inst);
diff --git a/src/modules/temperature/e_mod_tempget.c b/src/modules/temperature/e_mod_tempget.c
index 098feed04..c9cc19ac0 100644
--- a/src/modules/temperature/e_mod_tempget.c
+++ b/src/modules/temperature/e_mod_tempget.c
@@ -1,16 +1,16 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-int
-_temperature_cb_exe_data(void *data, int type, void *event)
-{    
+Eina_Bool
+_temperature_cb_exe_data(void *data, __UNUSED__ int type, void *event)
+{
    Ecore_Exe_Event_Data *ev;
    Config_Face *inst;
    int temp;
 
    ev = event;
    inst = data;
-   if (ev->exe != inst->tempget_exe) return 1;
+   if (ev->exe != inst->tempget_exe) return ECORE_CALLBACK_PASS_ON;
    temp = -999;
    if ((ev->lines) && (ev->lines[0].line))
      {
@@ -59,18 +59,18 @@ _temperature_cb_exe_data(void *data, int type, void *event)
              inst->have_temp = 0;
           }
      }
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
 
-int
-_temperature_cb_exe_del(void *data, int type, void *event)
+Eina_Bool
+_temperature_cb_exe_del(void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
    Config_Face *inst;
 
    ev = event;
    inst = data;
-   if (ev->exe != inst->tempget_exe) return 1;
+   if (ev->exe != inst->tempget_exe) return ECORE_CALLBACK_PASS_ON;
    inst->tempget_exe = NULL;
-   return 0;
+   return ECORE_CALLBACK_DONE;
 }
diff --git a/src/modules/temperature/e_mod_udev.c b/src/modules/temperature/e_mod_udev.c
index 62720b321..03de22d9b 100644
--- a/src/modules/temperature/e_mod_udev.c
+++ b/src/modules/temperature/e_mod_udev.c
@@ -1,11 +1,11 @@
 #include "e.h"
 #include "e_mod_main.h"
 
-int
+Eina_Bool
 temperature_udev_update_poll(void *data)
 {
    temperature_udev_update(data);
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 void
diff --git a/src/modules/temperature/tempget.c b/src/modules/temperature/tempget.c
index ab7a1bf06..4d77a50f0 100644
--- a/src/modules/temperature/tempget.c
+++ b/src/modules/temperature/tempget.c
@@ -32,7 +32,7 @@ static int ptemp = 0;
 
 static void init(void);
 static int check(void);
-static int poll_cb(void *data);
+static Eina_Bool poll_cb(void *data);
 
 Eina_List *
 temperature_get_bus_files(const char* bus)
@@ -411,7 +411,7 @@ check(void)
    return -999;
 }
 
-static int
+static Eina_Bool
 poll_cb(void *data)
 {
    int t;
@@ -445,7 +445,7 @@ poll_cb(void *data)
 	fflush(stdout);
      }
    ptemp = t;
-   return 1;
+   return ECORE_CALLBACK_RENEW;
 }
 
 int
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 97eb44c8f..5e3c46d66 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -23,17 +23,17 @@ static void _e_winlist_activate_nth(int n);
 static void _e_winlist_activate(void);
 static void _e_winlist_deactivate(void);
 static void _e_winlist_show_active(void);
-static int _e_winlist_cb_event_border_add(void *data, int type,  void *event);
-static int _e_winlist_cb_event_border_remove(void *data, int type,  void *event);
-static int _e_winlist_cb_key_down(void *data, int type, void *event);
-static int _e_winlist_cb_key_up(void *data, int type, void *event);
-static int _e_winlist_cb_mouse_down(void *data, int type, void *event);
-static int _e_winlist_cb_mouse_up(void *data, int type, void *event);
-static int _e_winlist_cb_mouse_wheel(void *data, int type, void *event);
-static int _e_winlist_cb_mouse_move(void *data, int type, void *event);
-static int _e_winlist_scroll_timer(void *data);
-static int _e_winlist_warp_timer(void *data);
-static int _e_winlist_animator(void *data);
+static Eina_Bool _e_winlist_cb_event_border_add(void *data, int type,  void *event);
+static Eina_Bool _e_winlist_cb_event_border_remove(void *data, int type,  void *event);
+static Eina_Bool _e_winlist_cb_key_down(void *data, int type, void *event);
+static Eina_Bool _e_winlist_cb_key_up(void *data, int type, void *event);
+static Eina_Bool _e_winlist_cb_mouse_down(void *data, int type, void *event);
+static Eina_Bool _e_winlist_cb_mouse_up(void *data, int type, void *event);
+static Eina_Bool _e_winlist_cb_mouse_wheel(void *data, int type, void *event);
+static Eina_Bool _e_winlist_cb_mouse_move(void *data, int type, void *event);
+static Eina_Bool _e_winlist_scroll_timer(void *data);
+static Eina_Bool _e_winlist_warp_timer(void *data);
+static Eina_Bool _e_winlist_animator(void *data);
 #if 0
 static void _e_winlist_cb_item_mouse_in(void *data, Evas *evas,
       Evas_Object *obj, void *event_info);
@@ -721,8 +721,8 @@ _e_winlist_restore_desktop(void)
      }
 }
 
-static int
-_e_winlist_cb_event_border_add(void *data, int type,  void *event)
+static Eina_Bool
+_e_winlist_cb_event_border_add(__UNUSED__ void *data, __UNUSED__ int type,  void *event)
 {
    E_Event_Border_Add *ev;
 
@@ -730,27 +730,27 @@ _e_winlist_cb_event_border_add(void *data, int type,  void *event)
    _e_winlist_border_add(ev->border, winlist->zone,
 			 e_desk_current_get(winlist->zone));
    _e_winlist_size_adjust();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_event_border_remove(void *data, int type,  void *event)
+static Eina_Bool
+_e_winlist_cb_event_border_remove(__UNUSED__ void *data, __UNUSED__ int type,  void *event)
 {
    E_Event_Border_Remove *ev;
 
    ev = event;
    _e_winlist_border_del(ev->border);
    _e_winlist_size_adjust();
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_key_down(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_key_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
    if (!strcmp(ev->key, "Up"))
      e_winlist_prev();
    else if (!strcmp(ev->key, "Down"))
@@ -820,11 +820,11 @@ _e_winlist_cb_key_down(void *data, int type, void *event)
 	       }
 	  }
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_key_up(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_key_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Key *ev;
    E_Action *act;
@@ -833,7 +833,7 @@ _e_winlist_cb_key_up(void *data, int type, void *event)
    E_Binding_Modifier mod;
 
    ev = event;
-   if (!winlist) return 1;
+   if (!winlist) return ECORE_CALLBACK_PASS_ON;
    if (hold_mod)
      {
 	if ((hold_mod & ECORE_EVENT_MODIFIER_SHIFT) && (!strcmp(ev->key, "Shift_L"))) 
@@ -899,41 +899,41 @@ _e_winlist_cb_key_up(void *data, int type, void *event)
 	  }
      }
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_mouse_down(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_mouse_down(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
    e_bindings_mouse_down_event_handle(E_BINDING_CONTEXT_WINLIST,
 				      E_OBJECT(winlist->zone), ev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_mouse_up(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_mouse_up(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
    e_bindings_mouse_up_event_handle(E_BINDING_CONTEXT_WINLIST,
 				    E_OBJECT(winlist->zone), ev);
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_cb_mouse_wheel(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_mouse_wheel(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Wheel *ev;
    int i;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
    e_bindings_wheel_event_handle(E_BINDING_CONTEXT_WINLIST,
 				 E_OBJECT(winlist->zone), ev);
    if (ev->z < 0) /* up */
@@ -946,25 +946,25 @@ _e_winlist_cb_mouse_wheel(void *data, int type, void *event)
 	for (i = ev->z; i > 0; i--) 
           e_winlist_next();
      }
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int 
-_e_winlist_cb_mouse_move(void *data, int type, void *event)
+static Eina_Bool
+_e_winlist_cb_mouse_move(__UNUSED__ void *data, __UNUSED__ int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
 
    ev = event;
-   if (ev->window != input_window) return 1;
+   if (ev->window != input_window) return ECORE_CALLBACK_PASS_ON;
 
    evas_event_feed_mouse_move(winlist->evas, ev->x - winlist->x +
 	 winlist->zone->x, ev->y - winlist->y + winlist->zone->y, ev->timestamp, NULL);
 
-   return 1;
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-static int
-_e_winlist_scroll_timer(void *data)
+static Eina_Bool
+_e_winlist_scroll_timer(__UNUSED__ void *data)
 {
    if (scroll_to)
      {
@@ -975,11 +975,11 @@ _e_winlist_scroll_timer(void *data)
 	return 1;
      }
    scroll_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
-_e_winlist_warp_timer(void *data)
+static Eina_Bool
+_e_winlist_warp_timer(__UNUSED__ void *data)
 {
    if (warp_to)
      {
@@ -994,11 +994,11 @@ _e_winlist_warp_timer(void *data)
 	return 1;
      }
    warp_timer = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
-static int
-_e_winlist_animator(void *data)
+static Eina_Bool
+_e_winlist_animator(__UNUSED__ void *data)
 {
    if (warp_to)
      {
@@ -1030,9 +1030,9 @@ _e_winlist_animator(void *data)
 	  }
         e_box_align_set(list_object, 0.5, 1.0 - scroll_align);
      }
-   if ((warp_to) || (scroll_to)) return 1;
+   if ((warp_to) || (scroll_to)) return ECORE_CALLBACK_RENEW;
    animator = NULL;
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 #if 0
diff --git a/src/modules/wizard/page_000.c b/src/modules/wizard/page_000.c
index 3229edfd2..5c0ff9afe 100644
--- a/src/modules/wizard/page_000.c
+++ b/src/modules/wizard/page_000.c
@@ -18,12 +18,12 @@ wizard_page_shutdown(E_Wizard_Page *pg)
    return 1;
 }
 
-static int
-_next_page(void *data)
+static Eina_Bool
+_next_page(__UNUSED__ void *data)
 {
    e_wizard_button_next_enable_set(1);
    e_wizard_next();
-   return 0;
+   return ECORE_CALLBACK_CANCEL;
 }
 
 EAPI int