cedric pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f7065474ce8ea1bb0673eed533d4abbb8d661de8
commit f7065474ce8ea1bb0673eed533d4abbb8d661de8 Author: Thierry <[email protected]> Date: Wed Aug 26 11:45:42 2015 +0200 fix backport with left over function that didn't exist in early history of man kind^W^W^WEnlightenment 17. Signed-off-by: Cedric BAIL <[email protected]> --- src/bin/e.h | 2 +- src/bin/e_border.c | 4 ++-- src/bin/e_fm.c | 2 +- src/bin/e_menu.c | 14 +++++++------- src/bin/e_popup.c | 2 +- src/modules/shot/e_mod_main.c | 2 +- src/modules/xkbswitch/e_mod_main.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/bin/e.h b/src/bin/e.h index 963163b..ae69638 100644 --- a/src/bin/e.h +++ b/src/bin/e.h @@ -172,7 +172,7 @@ typedef struct _E_Rect E_Rect; #ifndef MAX # define MAX(x, y) (((x) > (y)) ? (x) : (y)) #endif -# define E_FN_DEL(_fn, _h) if (_h) { _fn((void*)_h); _h = NULL; } +# define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0) # define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \ (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy))) # define E_INSIDE(x, y, xx, yy, ww, hh) \ diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 1be0c94..e7363fe 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -3793,7 +3793,7 @@ _e_border_action_move_timeout(void *data __UNUSED__) static void _e_border_action_move_timeout_add(void) { - E_FN_DEL(ecore_timer_del, action_timer); + E_FREE_FUNC(action_timer, ecore_timer_del); if (e_config->border_keyboard.timeout) action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL); } @@ -3904,7 +3904,7 @@ _e_border_action_resize_timeout(void *data __UNUSED__) static void _e_border_action_resize_timeout_add(void) { - E_FN_DEL(ecore_timer_del, action_timer); + E_FREE_FUNC(action_timer, ecore_timer_del); if (e_config->border_keyboard.timeout) action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL); } diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 0dbf747..87616f0 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -1664,7 +1664,7 @@ _e_fm2_icons_update_helper(E_Fm2_Smart_Data *sd, Eina_Bool icon_only) if (!ic->realized) continue; if (icon_only) { - E_FN_DEL(evas_object_del, ic->obj_icon); + E_FREE_FUNC(ic->obj_icon, evas_object_del); _e_fm2_icon_icon_set(ic); } else diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index 7c6531c..2dadd3b 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -193,13 +193,13 @@ e_menu_shutdown(void) { E_Menu *m; - E_FN_DEL(ecore_event_handler_del, _e_menu_key_down_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_key_up_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_down_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_up_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_move_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_wheel_handler); - E_FN_DEL(ecore_event_handler_del, _e_menu_window_shape_handler); + E_FREE_FUNC(_e_menu_key_down_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_key_up_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_mouse_down_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_mouse_up_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_mouse_move_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_mouse_wheel_handler, ecore_event_handler_del); + E_FREE_FUNC(_e_menu_window_shape_handler, ecore_event_handler_del); if (!x_fatal) { diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c index e2210ad..ff148a3 100644 --- a/src/bin/e_popup.c +++ b/src/bin/e_popup.c @@ -30,7 +30,7 @@ e_popup_shutdown(void) eina_hash_free(_e_popup_hash); _e_popup_hash = NULL; } - E_FN_DEL(ecore_event_handler_del, _e_popup_window_shape_handler); + E_FREE_FUNC(_e_popup_window_shape_handler, ecore_event_handler_del); return 1; } diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c index 8ee38b6..5b22e8b 100644 --- a/src/modules/shot/e_mod_main.c +++ b/src/modules/shot/e_mod_main.c @@ -1002,7 +1002,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__) e_object_del(E_OBJECT(win)); win = NULL; } - E_FN_DEL(e_object_del, cd); + E_FREE_FUNC(cd, e_object_del); if (timer) { ecore_timer_del(timer); diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c index 1e0f557..d3cc361 100644 --- a/src/modules/xkbswitch/e_mod_main.c +++ b/src/modules/xkbswitch/e_mod_main.c @@ -138,7 +138,7 @@ _xkb_update_icon(int cur_group) e_config_xkb_layout_free(inst->layout); inst->layout = e_config->xkb.current_layout; } - E_FN_DEL(evas_object_del, inst->o_xkbflag); + E_FREE_FUNC(inst->o_xkbflag, evas_object_del); e_theme_edje_object_set(inst->o_xkbswitch, "base/theme/modules/xkbswitch", "e/modules/xkbswitch/noflag"); --
