aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-02-19 12:58:25 +0000
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-02-22 13:18:30 +0000
commitbf9933a336951179a0cd9aab920e6093d066d950 (patch)
tree04d6fb56d07dd428a80e70063965fa3716bcb057
parent81b723aa986fac4cddb62b1a1b0884507776d72f (diff)
downloadenlightenment-bf9933a336951179a0cd9aab920e6093d066d950.tar.gz
enlightenment-bf9933a336951179a0cd9aab920e6093d066d950.tar.xz
enlightenment-bf9933a336951179a0cd9aab920e6093d066d950.zip
E_FN_DEL macro renamed to E_FREE_FUNC with param order swapped for consistency
-rw-r--r--ChangeLog1
-rw-r--r--NEWS1
-rw-r--r--src/bin/e.h2
-rw-r--r--src/bin/e_bg.c6
-rw-r--r--src/bin/e_border.c4
-rw-r--r--src/bin/e_comp.c22
-rw-r--r--src/bin/e_config.c2
-rw-r--r--src/bin/e_configure_option.c36
-rw-r--r--src/bin/e_fm.c2
-rw-r--r--src/bin/e_gadcon.c8
-rw-r--r--src/bin/e_gadcon_popup.c6
-rw-r--r--src/bin/e_main.c2
-rw-r--r--src/bin/e_menu.c16
-rw-r--r--src/bin/e_module.c4
-rw-r--r--src/bin/e_popup.c12
-rw-r--r--src/modules/backlight/e_mod_main.c2
-rw-r--r--src/modules/conf2/e_conf2.c32
-rw-r--r--src/modules/conf_applications/e_int_config_apps.c4
-rw-r--r--src/modules/connman/e_mod_main.c2
-rw-r--r--src/modules/music-control/ui.c2
-rw-r--r--src/modules/shot/e_mod_main.c2
-rw-r--r--src/modules/winlist/e_winlist.c6
-rw-r--r--src/modules/xkbswitch/e_mod_main.c2
23 files changed, 89 insertions, 87 deletions
diff --git a/ChangeLog b/ChangeLog
index c0e8adb0c..5cc78c073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
* compositor now allows user changing/remembering of object opacity
* added E_LIST_REVERSE_FREE macro
+ * E_FN_DEL renamed to E_FREE_FUNC for consistency
2013-02-20 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index 4555eff3d..91c33178b 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,7 @@ Changes:
* e_xkb_layout API now deals directly with E_Config_XKB_Layout structs
* e_shelf_desk_visible_get now takes const params
* e_util_size_debug_set now also prints for object show/hide events
+ * E_FN_DEL renamed to E_FREE_FUNC for consistency
Config:
* move winlist_warp_speed option to pointer_warp_speed
* bindings now use new E_Binding_Event structs for mouse events
diff --git a/src/bin/e.h b/src/bin/e.h
index 2aa39ac09..314cd326e 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -179,7 +179,7 @@ typedef struct _E_Rect E_Rect;
# define eina_list_last_data_get(X) eina_list_data_get(eina_list_last(X))
#endif
-# define E_FN_DEL(_fn, _h) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0)
+# 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_bg.c b/src/bin/e_bg.c
index d60a23c7a..c17d375df 100644
--- a/src/bin/e_bg.c
+++ b/src/bin/e_bg.c
@@ -221,17 +221,17 @@ e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition)
}
if (transition == E_BG_TRANSITION_NONE)
- E_FN_DEL(evas_object_del, zone->bg_object);
+ E_FREE_FUNC(zone->bg_object, evas_object_del);
else
{
char buf[4096];
if (zone->bg_object)
{
- E_FN_DEL(evas_object_del, zone->prev_bg_object);
+ E_FREE_FUNC(zone->prev_bg_object, evas_object_del);
zone->prev_bg_object = zone->bg_object;
zone->bg_object = NULL;
- E_FN_DEL(evas_object_del, zone->transition_object);
+ E_FREE_FUNC(zone->transition_object, evas_object_del);
}
o = edje_object_add(zone->container->bg_evas);
evas_object_repeat_events_set(o, 1);
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 03e55aeb6..9c90aee3b 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3797,7 +3797,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);
}
@@ -3908,7 +3908,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_comp.c b/src/bin/e_comp.c
index 428f0d69e..bc298bc50 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -2198,14 +2198,14 @@ _e_comp_win_del(E_Comp_Win *cw)
e_object_unref(E_OBJECT(cw->eobj));
cw->eobj = NULL;
}
- E_FN_DEL(ecore_timer_del, cw->opacity_set_timer);
+ E_FREE_FUNC(cw->opacity_set_timer, ecore_timer_del);
if (cw->animating)
{
cw->c->animating--;
}
cw->animating = 0;
- E_FN_DEL(e_comp_render_update_free, cw->up);
+ E_FREE_FUNC(cw->up, e_comp_render_update_free);
DBG(" [0x%x] del", cw->win);
E_FREE(cw->rects);
if (cw->update_timeout)
@@ -2291,7 +2291,7 @@ _e_comp_win_del(E_Comp_Win *cw)
cw->shobj = NULL;
}
- if (cw->free_shape) E_FN_DEL(e_object_del, cw->shape);
+ if (cw->free_shape) E_FREE_FUNC(cw->shape, e_object_del);
free(cw->title);
free(cw->name);
@@ -4024,9 +4024,9 @@ _e_comp_del(E_Comp *c)
hide_bd = eina_list_append(hide_bd, bd);
}
- E_FN_DEL(evas_object_del, c->fps_fg);
- E_FN_DEL(evas_object_del, c->fps_bg);
- E_FN_DEL(ecore_job_del, c->shape_job);
+ E_FREE_FUNC(c->fps_fg, evas_object_del);
+ E_FREE_FUNC(c->fps_bg, evas_object_del);
+ E_FREE_FUNC(c->shape_job, ecore_job_del);
ecore_x_window_key_ungrab(c->man->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
ECORE_EVENT_MODIFIER_CTRL |
@@ -4103,7 +4103,7 @@ _e_comp_sys_done_cb(void *data, Evas_Object *obj, const char *sig, const char *s
{
edje_object_signal_callback_del(obj, sig, src, _e_comp_sys_done_cb);
e_sys_action_raw_do((E_Sys_Action)(long)data, NULL);
- E_FN_DEL(ecore_timer_del, action_timeout);
+ E_FREE_FUNC(action_timeout, ecore_timer_del);
}
static Eina_Bool
@@ -4135,7 +4135,7 @@ _e_comp_sys_action_timeout(void *data)
default:
break;
}
- E_FN_DEL(ecore_timer_del, action_timeout);
+ E_FREE_FUNC(action_timeout, ecore_timer_del);
if (sig)
{
EINA_LIST_FOREACH(compositors, l, c)
@@ -4698,7 +4698,7 @@ EINTERN int
e_comp_shutdown(void)
{
if (!compositors) return 1;
- E_FN_DEL(ecore_timer_del, action_timeout);
+ E_FREE_FUNC(action_timeout, ecore_timer_del);
E_FREE_LIST(compositors, _e_comp_del);
E_FREE_LIST(handlers, ecore_event_handler_del);
E_FREE_LIST(actions, e_object_del);
@@ -4912,8 +4912,8 @@ e_comp_zone_update(E_Comp_Zone *cz)
over_styles[conf->disable_screen_effects]);
return;
}
- E_FN_DEL(evas_object_del, cz->base);
- E_FN_DEL(evas_object_del, cz->over);
+ E_FREE_FUNC(cz->base, evas_object_del);
+ E_FREE_FUNC(cz->over, evas_object_del);
cz->base = o = edje_object_add(cz->comp->evas);
evas_object_repeat_events_set(o, 1);
evas_object_name_set(cz->base, "cz->base");
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 2e8a4d3e3..f70c19b98 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1398,7 +1398,7 @@ e_config_load(void)
EAPI int
e_config_save(void)
{
- E_FN_DEL(e_powersave_deferred_action_del, _e_config_save_defer);
+ E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del);
_e_config_save_cb(NULL);
return e_config_domain_save("e", _e_config_edd, e_config);
}
diff --git a/src/bin/e_configure_option.c b/src/bin/e_configure_option.c
index 880079d8f..b0fe4e9f2 100644
--- a/src/bin/e_configure_option.c
+++ b/src/bin/e_configure_option.c
@@ -2075,33 +2075,33 @@ e_configure_option_shutdown(void)
event_block = EINA_TRUE;
E_FREE_LIST(tags_list, eina_stringshare_del);
domain_current = NULL;
- E_FN_DEL(eina_hash_free, domain_hash);
- E_FN_DEL(eina_hash_free, tags_hash);
- E_FN_DEL(eina_hash_free, tags_tag_alias_hash);
- E_FN_DEL(eina_hash_free, tags_name_hash);
- E_FN_DEL(eina_hash_free, tags_alias_name_hash);
- E_FN_DEL(eina_hash_free, tags_alias_hash);
+ E_FREE_FUNC(domain_hash, eina_hash_free);
+ E_FREE_FUNC(tags_hash, eina_hash_free);
+ E_FREE_FUNC(tags_tag_alias_hash, eina_hash_free);
+ E_FREE_FUNC(tags_name_hash, eina_hash_free);
+ E_FREE_FUNC(tags_alias_name_hash, eina_hash_free);
+ E_FREE_FUNC(tags_alias_hash, eina_hash_free);
E_FREE_LIST(tags_alias_list, eina_stringshare_del);
- E_FN_DEL(eio_monitor_del, theme_mon[0]);
- E_FN_DEL(eio_monitor_del, theme_mon[1]);
- E_FN_DEL(eio_file_cancel, theme_ls[0]);
- E_FN_DEL(eio_file_cancel, theme_ls[1]);
- E_FN_DEL(eio_file_cancel, gtk_theme_ls);
+ E_FREE_FUNC(theme_mon[0], eio_monitor_del);
+ E_FREE_FUNC(theme_mon[1], eio_monitor_del);
+ E_FREE_FUNC(theme_ls[0], eio_file_cancel);
+ E_FREE_FUNC(theme_ls[1], eio_file_cancel);
+ E_FREE_FUNC(gtk_theme_ls, eio_file_cancel);
E_FREE_LIST(gtk_theme_dirs, eio_file_cancel);
- E_FN_DEL(eio_monitor_del, gtk_theme_mon);
+ E_FREE_FUNC(gtk_theme_mon, eio_monitor_del);
E_FREE_LIST(gtk_theme_mons, eio_monitor_del);
E_FREE_LIST(gtk_themes, eina_stringshare_del);
E_FREE_LIST(themes, eina_stringshare_del);
E_FREE_LIST(sthemes, eina_stringshare_del);
- E_FN_DEL(eio_monitor_del, bg_mon[0]);
- E_FN_DEL(eio_monitor_del, bg_mon[1]);
- E_FN_DEL(eio_file_cancel, bg_ls[0]);
- E_FN_DEL(eio_file_cancel, bg_ls[1]);
+ E_FREE_FUNC(bg_mon[0], eio_monitor_del);
+ E_FREE_FUNC(bg_mon[1], eio_monitor_del);
+ E_FREE_FUNC(bg_ls[0], eio_file_cancel);
+ E_FREE_FUNC(bg_ls[1], eio_file_cancel);
E_FREE_LIST(bgs, eina_stringshare_del);
E_FREE_LIST(sbgs, eina_stringshare_del);
E_FREE_LIST(handlers, ecore_event_handler_del);
- E_FN_DEL(eina_hash_free, category_hash);
- E_FN_DEL(eina_hash_free, category_icon_hash);
+ E_FREE_FUNC(category_hash, eina_hash_free);
+ E_FREE_FUNC(category_icon_hash, eina_hash_free);
categories = eina_list_free(categories);
return 1;
}
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index c8d2bb1e3..ae9bae4e0 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_gadcon.c b/src/bin/e_gadcon.c
index 769903003..d90063ba1 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -2062,10 +2062,10 @@ _e_gadcon_client_delfn(void *d __UNUSED__, void *o)
if (gcc->drag.drag)
e_object_del(E_OBJECT(gcc->drag.drag));
gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
- E_FN_DEL(ecore_timer_del, gcc->scroll_timer);
- E_FN_DEL(ecore_animator_del, gcc->scroll_animator);
- E_FN_DEL(evas_object_del, gcc->o_box);
- E_FN_DEL(evas_object_del, gcc->o_frame);
+ E_FREE_FUNC(gcc->scroll_timer, ecore_timer_del);
+ E_FREE_FUNC(gcc->scroll_animator, ecore_animator_del);
+ E_FREE_FUNC(gcc->o_box, evas_object_del);
+ E_FREE_FUNC(gcc->o_frame, evas_object_del);
e_object_ref(E_OBJECT(gcc));
ev = E_NEW(E_Event_Gadcon_Client_Add, 1);
ev->gcc = gcc;
diff --git a/src/bin/e_gadcon_popup.c b/src/bin/e_gadcon_popup.c
index 5cf96db2b..ba3aff381 100644
--- a/src/bin/e_gadcon_popup.c
+++ b/src/bin/e_gadcon_popup.c
@@ -43,8 +43,8 @@ _e_gadcon_popup_locked_set(E_Gadcon_Popup *pop, Eina_Bool locked)
static void
_e_gadcon_popup_free(E_Gadcon_Popup *pop)
{
- E_FN_DEL(ecore_event_handler_del, pop->autoclose_handlers[0]);
- E_FN_DEL(ecore_event_handler_del, pop->autoclose_handlers[1]);
+ E_FREE_FUNC(pop->autoclose_handlers[0], ecore_event_handler_del);
+ E_FREE_FUNC(pop->autoclose_handlers[1], ecore_event_handler_del);
if (pop->gadcon_was_locked)
_e_gadcon_popup_locked_set(pop, 0);
@@ -52,7 +52,7 @@ _e_gadcon_popup_free(E_Gadcon_Popup *pop)
evas_object_del(pop->content);
if (pop->win)
E_OBJECT_DEL_SET(pop->win, NULL);
- E_FN_DEL(e_object_del, pop->win);
+ E_FREE_FUNC(pop->win, e_object_del);
free(pop);
}
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 7629d9d0e..6d6522042 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -1815,7 +1815,7 @@ static Eina_Bool
_e_main_modules_load_after(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED)
{
e_int_config_modules(NULL, NULL);
- E_FN_DEL(ecore_event_handler_del, mod_init_end);
+ E_FREE_FUNC(mod_init_end, ecore_event_handler_del);
return ECORE_CALLBACK_RENEW;
}
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 167521afe..d6d6a0895 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)
{
@@ -1318,7 +1318,7 @@ _e_menu_free(E_Menu *m)
if (cb->free) cb->free(cb->data);
}
}
- if (m->parent_item && (m->parent_item->submenu == m))
+ if (m->parent_item)
m->parent_item->submenu = NULL;
_e_menu_unrealize(m);
E_FREE(m->shape_rects);
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index ae81af726..d7a00cc7f 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -198,8 +198,8 @@ e_module_shutdown(void)
}
}
- E_FN_DEL(eina_hash_free, _e_module_path_hash);
- E_FN_DEL(eina_hash_free, _e_modules_hash);
+ E_FREE_FUNC(_e_module_path_hash, eina_hash_free);
+ E_FREE_FUNC(_e_modules_hash, eina_hash_free);
E_FREE_LIST(handlers, ecore_event_handler_del);
E_FREE_LIST(_e_module_path_monitors, eio_monitor_del);
E_FREE_LIST(_e_module_path_lists, eio_file_cancel);
diff --git a/src/bin/e_popup.c b/src/bin/e_popup.c
index 5a469a2a3..312bf1702 100644
--- a/src/bin/e_popup.c
+++ b/src/bin/e_popup.c
@@ -16,9 +16,9 @@ _e_popup_autoclose_cleanup(void)
e_grabinput_release(0, e_comp_get(autoclose_popup)->ee_win);
autoclose_popup->autoclose = 0;
}
- E_FN_DEL(e_object_del, autoclose_popup);
- E_FN_DEL(evas_object_del, event_rect);
- E_FN_DEL(ecore_event_handler_del, key_handler);
+ E_FREE_FUNC(autoclose_popup, e_object_del);
+ E_FREE_FUNC(event_rect, evas_object_del);
+ E_FREE_FUNC(key_handler, ecore_event_handler_del);
}
static void
@@ -27,7 +27,7 @@ _e_popup_free(E_Popup *pop)
e_object_unref(E_OBJECT(pop->zone));
if (pop->autoclose)
_e_popup_autoclose_cleanup();
- E_FN_DEL(e_object_del, pop->shape);
+ E_FREE_FUNC(pop->shape, e_object_del);
E_FREE_LIST(pop->objects, evas_object_del);
pop->zone->popups = eina_list_remove(pop->zone->popups, pop);
eina_stringshare_del(pop->name);
@@ -56,8 +56,8 @@ _e_popup_autoclose_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas
static void
_e_popup_autoclose_setup(E_Popup *pop)
{
- E_FN_DEL(e_object_del, autoclose_popup);
- E_FN_DEL(evas_object_del, event_rect);
+ E_FREE_FUNC(autoclose_popup, e_object_del);
+ E_FREE_FUNC(event_rect, evas_object_del);
event_rect = evas_object_rectangle_add(e_comp_get(pop)->evas);
evas_object_color_set(event_rect, 0, 0, 0, 0);
diff --git a/src/modules/backlight/e_mod_main.c b/src/modules/backlight/e_mod_main.c
index 092a52e97..3c192c84a 100644
--- a/src/modules/backlight/e_mod_main.c
+++ b/src/modules/backlight/e_mod_main.c
@@ -215,7 +215,7 @@ _backlight_popup_new(Instance *inst)
static void
_backlight_popup_free(Instance *inst)
{
- E_FN_DEL(e_object_del, inst->popup);
+ E_FREE_FUNC(inst->popup, e_object_del);
}
static void
diff --git a/src/modules/conf2/e_conf2.c b/src/modules/conf2/e_conf2.c
index 5fd0eda31..f094be68e 100644
--- a/src/modules/conf2/e_conf2.c
+++ b/src/modules/conf2/e_conf2.c
@@ -235,7 +235,7 @@ _tag_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
const Eina_List *l;
Eina_Stringshare *tag;
- E_FN_DEL(ecore_timer_del, reset_timer);
+ E_FREE_FUNC(reset_timer, ecore_timer_del);
if (!ctx_click) ctx_click = e_configure_option_ctx_new();
if (!e_configure_option_ctx_tag_add(ctx_click, data)) return;
_ctx_active_update();
@@ -261,7 +261,7 @@ _cat_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
elm_object_disabled_set(back, 0);
if (!ctx_click) ctx_click = e_configure_option_ctx_new();
ctx_click->category = ctx_active->category = data;
- E_FN_DEL(ecore_timer_del, reset_timer);
+ E_FREE_FUNC(reset_timer, ecore_timer_del);
elm_genlist_clear(list[0]);
EINA_LIST_FOREACH(e_configure_option_category_list_tags(data), l, tag)
{
@@ -299,8 +299,8 @@ _reset_cb(void *d EINA_UNUSED)
ctx_active->match_tags = eina_list_free(ctx_active->match_tags);
ctx_active->tags = eina_list_free(ctx_active->tags);
ctx_active->opts = eina_list_free(ctx_active->opts);
- E_FN_DEL(e_configure_option_ctx_free, ctx_entry);
- E_FN_DEL(e_configure_option_ctx_free, ctx_click);
+ E_FREE_FUNC(ctx_entry, e_configure_option_ctx_free);
+ E_FREE_FUNC(ctx_click, e_configure_option_ctx_free);
EINA_LIST_FOREACH(e_configure_option_category_list(), l, cat)
elm_genlist_item_append(list[0], itc_cats, cat, NULL, 0, _cat_sel, cat);
elm_object_disabled_set(back, 1);
@@ -316,9 +316,9 @@ _entry_change_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA
Eina_Stringshare *txt, *tag;
Eina_List *l;
- E_FN_DEL(ecore_timer_del, reset_timer);
+ E_FREE_FUNC(reset_timer, ecore_timer_del);
txt = elm_entry_entry_get(obj);
- E_FN_DEL(evas_object_del, overlay);
+ E_FREE_FUNC(overlay, evas_object_del);
if (!ctx_entry) ctx_entry = e_configure_option_ctx_new();
if (!e_configure_option_ctx_update(ctx_entry, txt)) return;
_ctx_active_update();
@@ -383,14 +383,14 @@ _back_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
Eina_Stringshare *tag;
Eina_Bool cat = EINA_FALSE;
- E_FN_DEL(ecore_timer_del, reset_timer);
+ E_FREE_FUNC(reset_timer, ecore_timer_del);
if (overlay)
{
evas_object_del(overlay);
return;
}
if (!ctx_click) return;
- E_FN_DEL(evas_object_del, overlay);
+ E_FREE_FUNC(overlay, evas_object_del);
if (ctx_click->tags)
{
cat = EINA_TRUE;
@@ -417,14 +417,14 @@ _back_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
static void
_e_conf2_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- E_FN_DEL(elm_genlist_item_class_free, itc_cats);
- E_FN_DEL(elm_genlist_item_class_free, itc_tags);
- E_FN_DEL(elm_genlist_item_class_free, itc_opts);
- E_FN_DEL(elm_genlist_item_class_free, itc_thumb);
- E_FN_DEL(e_configure_option_ctx_free, ctx_entry);
- E_FN_DEL(e_configure_option_ctx_free, ctx_click);
- E_FN_DEL(e_configure_option_ctx_free, ctx_active);
- E_FN_DEL(ecore_timer_del, reset_timer);
+ E_FREE_FUNC(itc_cats, elm_genlist_item_class_free);
+ E_FREE_FUNC(itc_tags, elm_genlist_item_class_free);
+ E_FREE_FUNC(itc_opts, elm_genlist_item_class_free);
+ E_FREE_FUNC(itc_thumb, elm_genlist_item_class_free);
+ E_FREE_FUNC(ctx_entry, e_configure_option_ctx_free);
+ E_FREE_FUNC(ctx_click, e_configure_option_ctx_free);
+ E_FREE_FUNC(ctx_active, e_configure_option_ctx_free);
+ E_FREE_FUNC(reset_timer, ecore_timer_del);
list[0] = list[1] = layout = overlay = back = entry = NULL;
E_FREE_LIST(handlers, ecore_event_handler_del);
e_configure_option_reset_all();
diff --git a/src/modules/conf_applications/e_int_config_apps.c b/src/modules/conf_applications/e_int_config_apps.c
index ba5dbf68e..f3d939df4 100644
--- a/src/modules/conf_applications/e_int_config_apps.c
+++ b/src/modules/conf_applications/e_int_config_apps.c
@@ -232,8 +232,8 @@ _free_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
E_FREE_LIST(cfdata->apps, efreet_desktop_free);
eina_list_free(cfdata->apps_user.icons);
eina_list_free(cfdata->apps_xdg.icons);
- E_FN_DEL(ecore_idler_del, cfdata->apps_user.idler);
- E_FN_DEL(ecore_idler_del, cfdata->apps_xdg.idler);
+ E_FREE_FUNC(cfdata->apps_user.idler, ecore_idler_del);
+ E_FREE_FUNC(cfdata->apps_xdg.idler, ecore_idler_del);
e_widget_ilist_clear(cfdata->apps_xdg.o_list);
/* FIXME: this is suuuuper slow and blocking :/ */
e_widget_ilist_clear(cfdata->apps_user.o_list);
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index fdee64a9d..8cd25e939 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -294,7 +294,7 @@ _econnman_popup_new(E_Connman_Instance *inst)
void
econnman_popup_del(E_Connman_Instance *inst)
{
- E_FN_DEL(e_object_del, inst->popup);
+ E_FREE_FUNC(inst->popup, e_object_del);
}
static void
diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c
index 33c655616..94e42d1b5 100644
--- a/src/modules/music-control/ui.c
+++ b/src/modules/music-control/ui.c
@@ -88,7 +88,7 @@ _popup_new(E_Music_Control_Instance *inst)
void
music_control_popup_del(E_Music_Control_Instance *inst)
{
- E_FN_DEL(e_object_del, inst->popup);
+ E_FREE_FUNC(inst->popup, e_object_del);
}
struct _E_Config_Dialog_Data
diff --git a/src/modules/shot/e_mod_main.c b/src/modules/shot/e_mod_main.c
index 1d107daab..59d0abf7b 100644
--- a/src/modules/shot/e_mod_main.c
+++ b/src/modules/shot/e_mod_main.c
@@ -1001,7 +1001,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/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 25ecea42c..73b0f029c 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -256,8 +256,8 @@ e_winlist_hide(void)
E_FREE_LIST(_handlers, ecore_event_handler_del);
- E_FN_DEL(ecore_timer_del, _scroll_timer);
- E_FN_DEL(ecore_animator_del, _animator);
+ E_FREE_FUNC(_scroll_timer, ecore_timer_del);
+ E_FREE_FUNC(_animator, ecore_animator_del);
ecore_x_window_free(_input_window);
e_grabinput_release(_input_window, _input_window);
@@ -1004,7 +1004,7 @@ _e_winlist_activate(void)
}
else
{
- E_FN_DEL(ecore_animator_del, _animator);
+ E_FREE_FUNC(_animator, ecore_animator_del);
}
if ((!ww->border->lock_user_stacking) &&
diff --git a/src/modules/xkbswitch/e_mod_main.c b/src/modules/xkbswitch/e_mod_main.c
index 730605c3f..9edada435 100644
--- a/src/modules/xkbswitch/e_mod_main.c
+++ b/src/modules/xkbswitch/e_mod_main.c
@@ -152,7 +152,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");