* e: remove warning due to Ecore API change.

SVN revision: 49833
devs/princeamd/enlightenment-0.17-elive
Cedric BAIL 13 years ago
parent 61d7b9fe28
commit c6a118d738
  1. 30
      src/bin/e_acpi.c
  2. 216
      src/bin/e_actions.c
  3. 8
      src/bin/e_bg.c
  4. 10
      src/bin/e_bindings.c
  5. 466
      src/bin/e_border.c
  6. 2
      src/bin/e_border.h
  7. 3
      src/bin/e_box.c
  8. 8
      src/bin/e_canvas.c
  9. 4
      src/bin/e_config.c
  10. 6
      src/bin/e_config_dialog.c
  11. 6
      src/bin/e_configure.c
  12. 56
      src/bin/e_container.c
  13. 4
      src/bin/e_container.h
  14. 36
      src/bin/e_desk.c
  15. 66
      src/bin/e_desklock.c
  16. 145
      src/bin/e_dnd.c
  17. 12
      src/bin/e_dpms.c
  18. 3
      src/bin/e_editable.c
  19. 43
      src/bin/e_entry.c
  20. 28
      src/bin/e_exec.c
  21. 5
      src/bin/e_flowlayout.c
  22. 75
      src/bin/e_fm.c
  23. 90
      src/bin/e_fm_main.c
  24. 36
      src/bin/e_fm_op.c
  25. 9
      src/bin/e_focus.c
  26. 32
      src/bin/e_gadcon.c
  27. 6
      src/bin/e_ilist.c
  28. 6
      src/bin/e_init.c
  29. 46
      src/bin/e_init_main.c
  30. 4
      src/bin/e_int_border_remember.c
  31. 14
      src/bin/e_int_config_modules.c
  32. 22
      src/bin/e_int_gadcon_config.c
  33. 4
      src/bin/e_int_menus.c
  34. 3
      src/bin/e_int_shelf_config.c
  35. 14
      src/bin/e_intl.c
  36. 68
      src/bin/e_ipc.c
  37. 5
      src/bin/e_layout.c
  38. 3
      src/bin/e_livethumb.c
  39. 64
      src/bin/e_main.c
  40. 80
      src/bin/e_manager.c
  41. 2
      src/bin/e_manager.h
  42. 82
      src/bin/e_menu.c
  43. 12
      src/bin/e_module.c
  44. 8
      src/bin/e_msg.c
  45. 42
      src/bin/e_msgbus.c
  46. 12
      src/bin/e_order.c
  47. 3
      src/bin/e_pan.c
  48. 58
      src/bin/e_pointer.c
  49. 20
      src/bin/e_popup.c
  50. 6
      src/bin/e_powersave.c
  51. 12
      src/bin/e_remember.c
  52. 16
      src/bin/e_screensaver.c
  53. 10
      src/bin/e_scrollframe.c
  54. 50
      src/bin/e_shelf.c
  55. 11
      src/bin/e_slidecore.c
  56. 6
      src/bin/e_slider.c
  57. 11
      src/bin/e_spectrum.c
  58. 2
      src/bin/e_startup.c
  59. 30
      src/bin/e_sys.c
  60. 3
      src/bin/e_table.c
  61. 18
      src/bin/e_thumb.c
  62. 32
      src/bin/e_thumb_main.c
  63. 30
      src/bin/e_utils.c
  64. 12
      src/bin/e_widget_deskpreview.c
  65. 6
      src/bin/e_widget_ilist.c
  66. 80
      src/bin/e_zone.c
  67. 2
      src/bin/e_zone.h
  68. 50
      src/modules/battery/batget.c
  69. 24
      src/modules/battery/e_mod_main.c
  70. 34
      src/modules/bluez/e_mod_main.c
  71. 232
      src/modules/comp/e_mod_comp.c
  72. 4
      src/modules/comp/e_mod_config.c
  73. 10
      src/modules/conf/e_conf.c
  74. 8
      src/modules/conf/e_mod_main.c
  75. 20
      src/modules/conf_acpibindings/e_int_config_acpibindings.c
  76. 10
      src/modules/conf_applications/e_int_config_apps.c
  77. 16
      src/modules/conf_colors/e_int_config_color_classes.c
  78. 18
      src/modules/conf_desk/e_int_config_desk.c
  79. 20
      src/modules/conf_display/e_int_config_display.c
  80. 8
      src/modules/conf_icon_theme/e_int_config_icon_themes.c
  81. 18
      src/modules/conf_keybindings/e_int_config_keybindings.c
  82. 30
      src/modules/conf_mousebindings/e_int_config_mousebindings.c
  83. 10
      src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
  84. 10
      src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
  85. 32
      src/modules/conf_wallpaper2/e_int_config_wallpaper.c
  86. 34
      src/modules/connman/e_mod_main.c
  87. 18
      src/modules/cpufreq/e_mod_main.c
  88. 6
      src/modules/everything-apps/e_mod_main.c
  89. 12
      src/modules/everything-aspell/e_mod_main.c
  90. 36
      src/modules/everything-calc/e_mod_main.c
  91. 16
      src/modules/everything-windows/e_mod_main.c
  92. 16
      src/modules/everything/e_mod_main.c
  93. 2
      src/modules/everything/e_mod_main.h
  94. 96
      src/modules/everything/evry.c
  95. 2
      src/modules/everything/evry_api.h
  96. 32
      src/modules/everything/evry_view.c
  97. 4
      src/modules/everything/evry_view_tabs.c
  98. 32
      src/modules/fileman/e_fwin.c
  99. 20
      src/modules/fileman/e_mod_main.c
  100. 16
      src/modules/fileman_opinfo/e_mod_main.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -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;
}

@ -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");
}

@ -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

@ -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;
}

File diff suppressed because it is too large Load Diff

@ -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
{

@ -652,6 +652,9 @@ _e_box_smart_init(void)
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL
};
_e_smart = evas_smart_class_new(&sc);

@ -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;
}

@ -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);

@ -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

@ -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();