aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2010-06-24 16:19:12 +0000
committerCedric BAIL <cedric.bail@free.fr>2010-06-24 16:19:12 +0000
commitc6a118d73815638b2be8f18d0ca7fc4167728cd8 (patch)
tree089211fe84ad101eaae3d990c2f2f1e6a7d4ecee /src/bin
parent61d7b9fe28afd8b53a0b76c75b3e5002ff7c3e41 (diff)
downloadenlightenment-c6a118d73815638b2be8f18d0ca7fc4167728cd8.tar.gz
enlightenment-c6a118d73815638b2be8f18d0ca7fc4167728cd8.tar.xz
enlightenment-c6a118d73815638b2be8f18d0ca7fc4167728cd8.zip
* e: remove warning due to Ecore API change.
SVN revision: 49833
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/e_acpi.c30
-rw-r--r--src/bin/e_actions.c216
-rw-r--r--src/bin/e_bg.c8
-rw-r--r--src/bin/e_bindings.c10
-rw-r--r--src/bin/e_border.c466
-rw-r--r--src/bin/e_border.h2
-rw-r--r--src/bin/e_box.c3
-rw-r--r--src/bin/e_canvas.c8
-rw-r--r--src/bin/e_config.c4
-rw-r--r--src/bin/e_config_dialog.c6
-rw-r--r--src/bin/e_configure.c6
-rw-r--r--src/bin/e_container.c56
-rw-r--r--src/bin/e_container.h4
-rw-r--r--src/bin/e_desk.c36
-rw-r--r--src/bin/e_desklock.c66
-rw-r--r--src/bin/e_dnd.c145
-rw-r--r--src/bin/e_dpms.c12
-rw-r--r--src/bin/e_editable.c3
-rw-r--r--src/bin/e_entry.c43
-rw-r--r--src/bin/e_exec.c28
-rw-r--r--src/bin/e_flowlayout.c5
-rw-r--r--src/bin/e_fm.c75
-rw-r--r--src/bin/e_fm_main.c90
-rw-r--r--src/bin/e_fm_op.c36
-rw-r--r--src/bin/e_focus.c9
-rw-r--r--src/bin/e_gadcon.c32
-rw-r--r--src/bin/e_ilist.c6
-rw-r--r--src/bin/e_init.c6
-rw-r--r--src/bin/e_init_main.c46
-rw-r--r--src/bin/e_int_border_remember.c4
-rw-r--r--src/bin/e_int_config_modules.c14
-rw-r--r--src/bin/e_int_gadcon_config.c22
-rw-r--r--src/bin/e_int_menus.c4
-rw-r--r--src/bin/e_int_shelf_config.c3
-rw-r--r--src/bin/e_intl.c14
-rw-r--r--src/bin/e_ipc.c68
-rw-r--r--src/bin/e_layout.c5
-rw-r--r--src/bin/e_livethumb.c3
-rw-r--r--src/bin/e_main.c64
-rw-r--r--src/bin/e_manager.c80
-rw-r--r--src/bin/e_manager.h2
-rw-r--r--src/bin/e_menu.c82
-rw-r--r--src/bin/e_module.c12
-rw-r--r--src/bin/e_msg.c8
-rw-r--r--src/bin/e_msgbus.c42
-rw-r--r--src/bin/e_order.c12
-rw-r--r--src/bin/e_pan.c3
-rw-r--r--src/bin/e_pointer.c58
-rw-r--r--src/bin/e_popup.c20
-rw-r--r--src/bin/e_powersave.c6
-rw-r--r--src/bin/e_remember.c12
-rw-r--r--src/bin/e_screensaver.c16
-rw-r--r--src/bin/e_scrollframe.c10
-rw-r--r--src/bin/e_shelf.c50
-rw-r--r--src/bin/e_slidecore.c11
-rw-r--r--src/bin/e_slider.c6
-rw-r--r--src/bin/e_spectrum.c11
-rw-r--r--src/bin/e_startup.c2
-rw-r--r--src/bin/e_sys.c30
-rw-r--r--src/bin/e_table.c3
-rw-r--r--src/bin/e_thumb.c18
-rw-r--r--src/bin/e_thumb_main.c32
-rw-r--r--src/bin/e_utils.c30
-rw-r--r--src/bin/e_widget_deskpreview.c12
-rw-r--r--src/bin/e_widget_ilist.c6
-rw-r--r--src/bin/e_zone.c80
-rw-r--r--src/bin/e_zone.h2
67 files changed, 1178 insertions, 1136 deletions
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 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 int _e_border_cb_pointer_warp(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 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 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 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_window_shape(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
{