summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-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 @@
2 2
3 * compositor now allows user changing/remembering of object opacity 3 * compositor now allows user changing/remembering of object opacity
4 * added E_LIST_REVERSE_FREE macro 4 * added E_LIST_REVERSE_FREE macro
5 * E_FN_DEL renamed to E_FREE_FUNC for consistency
5 6
62013-02-20 Mike Blumenkrantz 72013-02-20 Mike Blumenkrantz
7 8
diff --git a/NEWS b/NEWS
index 4555eff3d..91c33178b 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,7 @@ Changes:
54 * e_xkb_layout API now deals directly with E_Config_XKB_Layout structs 54 * e_xkb_layout API now deals directly with E_Config_XKB_Layout structs
55 * e_shelf_desk_visible_get now takes const params 55 * e_shelf_desk_visible_get now takes const params
56 * e_util_size_debug_set now also prints for object show/hide events 56 * e_util_size_debug_set now also prints for object show/hide events
57 * E_FN_DEL renamed to E_FREE_FUNC for consistency
57 Config: 58 Config:
58 * move winlist_warp_speed option to pointer_warp_speed 59 * move winlist_warp_speed option to pointer_warp_speed
59 * bindings now use new E_Binding_Event structs for mouse events 60 * 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;
179# define eina_list_last_data_get(X) eina_list_data_get(eina_list_last(X)) 179# define eina_list_last_data_get(X) eina_list_data_get(eina_list_last(X))
180#endif 180#endif
181 181
182# define E_FN_DEL(_fn, _h) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0) 182# define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0)
183# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \ 183# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
184 (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy))) 184 (((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))
185# define E_INSIDE(x, y, xx, yy, ww, hh) \ 185# 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)
221 } 221 }
222 222
223 if (transition == E_BG_TRANSITION_NONE) 223 if (transition == E_BG_TRANSITION_NONE)
224 E_FN_DEL(evas_object_del, zone->bg_object); 224 E_FREE_FUNC(zone->bg_object, evas_object_del);
225 else 225 else
226 { 226 {
227 char buf[4096]; 227 char buf[4096];
228 228
229 if (zone->bg_object) 229 if (zone->bg_object)
230 { 230 {
231 E_FN_DEL(evas_object_del, zone->prev_bg_object); 231 E_FREE_FUNC(zone->prev_bg_object, evas_object_del);
232 zone->prev_bg_object = zone->bg_object; 232 zone->prev_bg_object = zone->bg_object;
233 zone->bg_object = NULL; 233 zone->bg_object = NULL;
234 E_FN_DEL(evas_object_del, zone->transition_object); 234 E_FREE_FUNC(zone->transition_object, evas_object_del);
235 } 235 }
236 o = edje_object_add(zone->container->bg_evas); 236 o = edje_object_add(zone->container->bg_evas);
237 evas_object_repeat_events_set(o, 1); 237 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__)
3797static void 3797static void
3798_e_border_action_move_timeout_add(void) 3798_e_border_action_move_timeout_add(void)
3799{ 3799{
3800 E_FN_DEL(ecore_timer_del, action_timer); 3800 E_FREE_FUNC(action_timer, ecore_timer_del);
3801 if (e_config->border_keyboard.timeout) 3801 if (e_config->border_keyboard.timeout)
3802 action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL); 3802 action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_move_timeout, NULL);
3803} 3803}
@@ -3908,7 +3908,7 @@ _e_border_action_resize_timeout(void *data __UNUSED__)
3908static void 3908static void
3909_e_border_action_resize_timeout_add(void) 3909_e_border_action_resize_timeout_add(void)
3910{ 3910{
3911 E_FN_DEL(ecore_timer_del, action_timer); 3911 E_FREE_FUNC(action_timer, ecore_timer_del);
3912 if (e_config->border_keyboard.timeout) 3912 if (e_config->border_keyboard.timeout)
3913 action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL); 3913 action_timer = ecore_timer_add(e_config->border_keyboard.timeout, _e_border_action_resize_timeout, NULL);
3914} 3914}
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)
2198 e_object_unref(E_OBJECT(cw->eobj)); 2198 e_object_unref(E_OBJECT(cw->eobj));
2199 cw->eobj = NULL; 2199 cw->eobj = NULL;
2200 } 2200 }
2201 E_FN_DEL(ecore_timer_del, cw->opacity_set_timer); 2201 E_FREE_FUNC(cw->opacity_set_timer, ecore_timer_del);
2202 if (cw->animating) 2202 if (cw->animating)
2203 { 2203 {
2204 cw->c->animating--; 2204 cw->c->animating--;
2205 } 2205 }
2206 cw->animating = 0; 2206 cw->animating = 0;
2207 2207
2208 E_FN_DEL(e_comp_render_update_free, cw->up); 2208 E_FREE_FUNC(cw->up, e_comp_render_update_free);
2209 DBG(" [0x%x] del", cw->win); 2209 DBG(" [0x%x] del", cw->win);
2210 E_FREE(cw->rects); 2210 E_FREE(cw->rects);
2211 if (cw->update_timeout) 2211 if (cw->update_timeout)
@@ -2291,7 +2291,7 @@ _e_comp_win_del(E_Comp_Win *cw)
2291 cw->shobj = NULL; 2291 cw->shobj = NULL;
2292 } 2292 }
2293 2293
2294 if (cw->free_shape) E_FN_DEL(e_object_del, cw->shape); 2294 if (cw->free_shape) E_FREE_FUNC(cw->shape, e_object_del);
2295 2295
2296 free(cw->title); 2296 free(cw->title);
2297 free(cw->name); 2297 free(cw->name);
@@ -4024,9 +4024,9 @@ _e_comp_del(E_Comp *c)
4024 hide_bd = eina_list_append(hide_bd, bd); 4024 hide_bd = eina_list_append(hide_bd, bd);
4025 } 4025 }
4026 4026
4027 E_FN_DEL(evas_object_del, c->fps_fg); 4027 E_FREE_FUNC(c->fps_fg, evas_object_del);
4028 E_FN_DEL(evas_object_del, c->fps_bg); 4028 E_FREE_FUNC(c->fps_bg, evas_object_del);
4029 E_FN_DEL(ecore_job_del, c->shape_job); 4029 E_FREE_FUNC(c->shape_job, ecore_job_del);
4030 4030
4031 ecore_x_window_key_ungrab(c->man->root, "F", ECORE_EVENT_MODIFIER_SHIFT | 4031 ecore_x_window_key_ungrab(c->man->root, "F", ECORE_EVENT_MODIFIER_SHIFT |
4032 ECORE_EVENT_MODIFIER_CTRL | 4032 ECORE_EVENT_MODIFIER_CTRL |
@@ -4103,7 +4103,7 @@ _e_comp_sys_done_cb(void *data, Evas_Object *obj, const char *sig, const char *s
4103{ 4103{
4104 edje_object_signal_callback_del(obj, sig, src, _e_comp_sys_done_cb); 4104 edje_object_signal_callback_del(obj, sig, src, _e_comp_sys_done_cb);
4105 e_sys_action_raw_do((E_Sys_Action)(long)data, NULL); 4105 e_sys_action_raw_do((E_Sys_Action)(long)data, NULL);
4106 E_FN_DEL(ecore_timer_del, action_timeout); 4106 E_FREE_FUNC(action_timeout, ecore_timer_del);
4107} 4107}
4108 4108
4109static Eina_Bool 4109static Eina_Bool
@@ -4135,7 +4135,7 @@ _e_comp_sys_action_timeout(void *data)
4135 default: 4135 default:
4136 break; 4136 break;
4137 } 4137 }
4138 E_FN_DEL(ecore_timer_del, action_timeout); 4138 E_FREE_FUNC(action_timeout, ecore_timer_del);
4139 if (sig) 4139 if (sig)
4140 { 4140 {
4141 EINA_LIST_FOREACH(compositors, l, c) 4141 EINA_LIST_FOREACH(compositors, l, c)
@@ -4698,7 +4698,7 @@ EINTERN int
4698e_comp_shutdown(void) 4698e_comp_shutdown(void)
4699{ 4699{
4700 if (!compositors) return 1; 4700 if (!compositors) return 1;
4701 E_FN_DEL(ecore_timer_del, action_timeout); 4701 E_FREE_FUNC(action_timeout, ecore_timer_del);
4702 E_FREE_LIST(compositors, _e_comp_del); 4702 E_FREE_LIST(compositors, _e_comp_del);
4703 E_FREE_LIST(handlers, ecore_event_handler_del); 4703 E_FREE_LIST(handlers, ecore_event_handler_del);
4704 E_FREE_LIST(actions, e_object_del); 4704 E_FREE_LIST(actions, e_object_del);
@@ -4912,8 +4912,8 @@ e_comp_zone_update(E_Comp_Zone *cz)
4912 over_styles[conf->disable_screen_effects]); 4912 over_styles[conf->disable_screen_effects]);
4913 return; 4913 return;
4914 } 4914 }
4915 E_FN_DEL(evas_object_del, cz->base); 4915 E_FREE_FUNC(cz->base, evas_object_del);
4916 E_FN_DEL(evas_object_del, cz->over); 4916 E_FREE_FUNC(cz->over, evas_object_del);
4917 cz->base = o = edje_object_add(cz->comp->evas); 4917 cz->base = o = edje_object_add(cz->comp->evas);
4918 evas_object_repeat_events_set(o, 1); 4918 evas_object_repeat_events_set(o, 1);
4919 evas_object_name_set(cz->base, "cz->base"); 4919 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)
1398EAPI int 1398EAPI int
1399e_config_save(void) 1399e_config_save(void)
1400{ 1400{
1401 E_FN_DEL(e_powersave_deferred_action_del, _e_config_save_defer); 1401 E_FREE_FUNC(_e_config_save_defer, e_powersave_deferred_action_del);
1402 _e_config_save_cb(NULL); 1402 _e_config_save_cb(NULL);
1403 return e_config_domain_save("e", _e_config_edd, e_config); 1403 return e_config_domain_save("e", _e_config_edd, e_config);
1404} 1404}
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)
2075 event_block = EINA_TRUE; 2075 event_block = EINA_TRUE;
2076 E_FREE_LIST(tags_list, eina_stringshare_del); 2076 E_FREE_LIST(tags_list, eina_stringshare_del);
2077 domain_current = NULL; 2077 domain_current = NULL;
2078 E_FN_DEL(eina_hash_free, domain_hash); 2078 E_FREE_FUNC(domain_hash, eina_hash_free);
2079 E_FN_DEL(eina_hash_free, tags_hash); 2079 E_FREE_FUNC(tags_hash, eina_hash_free);
2080 E_FN_DEL(eina_hash_free, tags_tag_alias_hash); 2080 E_FREE_FUNC(tags_tag_alias_hash, eina_hash_free);
2081 E_FN_DEL(eina_hash_free, tags_name_hash); 2081 E_FREE_FUNC(tags_name_hash, eina_hash_free);
2082 E_FN_DEL(eina_hash_free, tags_alias_name_hash); 2082 E_FREE_FUNC(tags_alias_name_hash, eina_hash_free);
2083 E_FN_DEL(eina_hash_free, tags_alias_hash); 2083 E_FREE_FUNC(tags_alias_hash, eina_hash_free);
2084 E_FREE_LIST(tags_alias_list, eina_stringshare_del); 2084 E_FREE_LIST(tags_alias_list, eina_stringshare_del);
2085 E_FN_DEL(eio_monitor_del, theme_mon[0]); 2085 E_FREE_FUNC(theme_mon[0], eio_monitor_del);
2086 E_FN_DEL(eio_monitor_del, theme_mon[1]); 2086 E_FREE_FUNC(theme_mon[1], eio_monitor_del);
2087 E_FN_DEL(eio_file_cancel, theme_ls[0]); 2087 E_FREE_FUNC(theme_ls[0], eio_file_cancel);
2088 E_FN_DEL(eio_file_cancel, theme_ls[1]); 2088 E_FREE_FUNC(theme_ls[1], eio_file_cancel);
2089 E_FN_DEL(eio_file_cancel, gtk_theme_ls); 2089 E_FREE_FUNC(gtk_theme_ls, eio_file_cancel);
2090 E_FREE_LIST(gtk_theme_dirs, eio_file_cancel); 2090 E_FREE_LIST(gtk_theme_dirs, eio_file_cancel);
2091 E_FN_DEL(eio_monitor_del, gtk_theme_mon); 2091 E_FREE_FUNC(gtk_theme_mon, eio_monitor_del);
2092 E_FREE_LIST(gtk_theme_mons, eio_monitor_del); 2092 E_FREE_LIST(gtk_theme_mons, eio_monitor_del);
2093 E_FREE_LIST(gtk_themes, eina_stringshare_del); 2093 E_FREE_LIST(gtk_themes, eina_stringshare_del);
2094 E_FREE_LIST(themes, eina_stringshare_del); 2094 E_FREE_LIST(themes, eina_stringshare_del);
2095 E_FREE_LIST(sthemes, eina_stringshare_del); 2095 E_FREE_LIST(sthemes, eina_stringshare_del);
2096 E_FN_DEL(eio_monitor_del, bg_mon[0]); 2096 E_FREE_FUNC(bg_mon[0], eio_monitor_del);
2097 E_FN_DEL(eio_monitor_del, bg_mon[1]); 2097 E_FREE_FUNC(bg_mon[1], eio_monitor_del);
2098 E_FN_DEL(eio_file_cancel, bg_ls[0]); 2098 E_FREE_FUNC(bg_ls[0], eio_file_cancel);
2099 E_FN_DEL(eio_file_cancel, bg_ls[1]); 2099 E_FREE_FUNC(bg_ls[1], eio_file_cancel);
2100 E_FREE_LIST(bgs, eina_stringshare_del); 2100 E_FREE_LIST(bgs, eina_stringshare_del);
2101 E_FREE_LIST(sbgs, eina_stringshare_del); 2101 E_FREE_LIST(sbgs, eina_stringshare_del);
2102 E_FREE_LIST(handlers, ecore_event_handler_del); 2102 E_FREE_LIST(handlers, ecore_event_handler_del);
2103 E_FN_DEL(eina_hash_free, category_hash); 2103 E_FREE_FUNC(category_hash, eina_hash_free);
2104 E_FN_DEL(eina_hash_free, category_icon_hash); 2104 E_FREE_FUNC(category_icon_hash, eina_hash_free);
2105 categories = eina_list_free(categories); 2105 categories = eina_list_free(categories);
2106 return 1; 2106 return 1;
2107} 2107}
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)
1664 if (!ic->realized) continue; 1664 if (!ic->realized) continue;
1665 if (icon_only) 1665 if (icon_only)
1666 { 1666 {
1667 E_FN_DEL(evas_object_del, ic->obj_icon); 1667 E_FREE_FUNC(ic->obj_icon, evas_object_del);
1668 _e_fm2_icon_icon_set(ic); 1668 _e_fm2_icon_icon_set(ic);
1669 } 1669 }
1670 else 1670 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)
2062 if (gcc->drag.drag) 2062 if (gcc->drag.drag)
2063 e_object_del(E_OBJECT(gcc->drag.drag)); 2063 e_object_del(E_OBJECT(gcc->drag.drag));
2064 gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc); 2064 gcc->gadcon->clients = eina_list_remove(gcc->gadcon->clients, gcc);
2065 E_FN_DEL(ecore_timer_del, gcc->scroll_timer); 2065 E_FREE_FUNC(gcc->scroll_timer, ecore_timer_del);
2066 E_FN_DEL(ecore_animator_del, gcc->scroll_animator); 2066 E_FREE_FUNC(gcc->scroll_animator, ecore_animator_del);
2067 E_FN_DEL(evas_object_del, gcc->o_box); 2067 E_FREE_FUNC(gcc->o_box, evas_object_del);
2068 E_FN_DEL(evas_object_del, gcc->o_frame); 2068 E_FREE_FUNC(gcc->o_frame, evas_object_del);
2069 e_object_ref(E_OBJECT(gcc)); 2069 e_object_ref(E_OBJECT(gcc));
2070 ev = E_NEW(E_Event_Gadcon_Client_Add, 1); 2070 ev = E_NEW(E_Event_Gadcon_Client_Add, 1);
2071 ev->gcc = gcc; 2071 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)
43static void 43static void
44_e_gadcon_popup_free(E_Gadcon_Popup *pop) 44_e_gadcon_popup_free(E_Gadcon_Popup *pop)
45{ 45{
46 E_FN_DEL(ecore_event_handler_del, pop->autoclose_handlers[0]); 46 E_FREE_FUNC(pop->autoclose_handlers[0], ecore_event_handler_del);
47 E_FN_DEL(ecore_event_handler_del, pop->autoclose_handlers[1]); 47 E_FREE_FUNC(pop->autoclose_handlers[1], ecore_event_handler_del);
48 48
49 if (pop->gadcon_was_locked) 49 if (pop->gadcon_was_locked)
50 _e_gadcon_popup_locked_set(pop, 0); 50 _e_gadcon_popup_locked_set(pop, 0);
@@ -52,7 +52,7 @@ _e_gadcon_popup_free(E_Gadcon_Popup *pop)
52 evas_object_del(pop->content); 52 evas_object_del(pop->content);
53 if (pop->win) 53 if (pop->win)
54 E_OBJECT_DEL_SET(pop->win, NULL); 54 E_OBJECT_DEL_SET(pop->win, NULL);
55 E_FN_DEL(e_object_del, pop->win); 55 E_FREE_FUNC(pop->win, e_object_del);
56 free(pop); 56 free(pop);
57} 57}
58 58
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
1815_e_main_modules_load_after(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED) 1815_e_main_modules_load_after(void *d EINA_UNUSED, int type EINA_UNUSED, void *ev EINA_UNUSED)
1816{ 1816{
1817 e_int_config_modules(NULL, NULL); 1817 e_int_config_modules(NULL, NULL);
1818 E_FN_DEL(ecore_event_handler_del, mod_init_end); 1818 E_FREE_FUNC(mod_init_end, ecore_event_handler_del);
1819 return ECORE_CALLBACK_RENEW; 1819 return ECORE_CALLBACK_RENEW;
1820} 1820}
1821 1821
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)
193{ 193{
194 E_Menu *m; 194 E_Menu *m;
195 195
196 E_FN_DEL(ecore_event_handler_del, _e_menu_key_down_handler); 196 E_FREE_FUNC(_e_menu_key_down_handler, ecore_event_handler_del);
197 E_FN_DEL(ecore_event_handler_del, _e_menu_key_up_handler); 197 E_FREE_FUNC(_e_menu_key_up_handler, ecore_event_handler_del);
198 E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_down_handler); 198 E_FREE_FUNC(_e_menu_mouse_down_handler, ecore_event_handler_del);
199 E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_up_handler); 199 E_FREE_FUNC(_e_menu_mouse_up_handler, ecore_event_handler_del);
200 E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_move_handler); 200 E_FREE_FUNC(_e_menu_mouse_move_handler, ecore_event_handler_del);
201 E_FN_DEL(ecore_event_handler_del, _e_menu_mouse_wheel_handler); 201 E_FREE_FUNC(_e_menu_mouse_wheel_handler, ecore_event_handler_del);
202 E_FN_DEL(ecore_event_handler_del, _e_menu_window_shape_handler); 202 E_FREE_FUNC(_e_menu_window_shape_handler, ecore_event_handler_del);
203 203
204 if (!x_fatal) 204 if (!x_fatal)
205 { 205 {
@@ -1318,7 +1318,7 @@ _e_menu_free(E_Menu *m)
1318 if (cb->free) cb->free(cb->data); 1318 if (cb->free) cb->free(cb->data);
1319 } 1319 }
1320 } 1320 }
1321 if (m->parent_item && (m->parent_item->submenu == m)) 1321 if (m->parent_item)
1322 m->parent_item->submenu = NULL; 1322 m->parent_item->submenu = NULL;
1323 _e_menu_unrealize(m); 1323 _e_menu_unrealize(m);
1324 E_FREE(m->shape_rects); 1324 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)
198 } 198 }
199 } 199 }
200 200
201 E_FN_DEL(eina_hash_free, _e_module_path_hash); 201 E_FREE_FUNC(_e_module_path_hash, eina_hash_free);
202 E_FN_DEL(eina_hash_free, _e_modules_hash); 202 E_FREE_FUNC(_e_modules_hash, eina_hash_free);
203 E_FREE_LIST(handlers, ecore_event_handler_del); 203 E_FREE_LIST(handlers, ecore_event_handler_del);
204 E_FREE_LIST(_e_module_path_monitors, eio_monitor_del); 204 E_FREE_LIST(_e_module_path_monitors, eio_monitor_del);
205 E_FREE_LIST(_e_module_path_lists, eio_file_cancel); 205 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)
16 e_grabinput_release(0, e_comp_get(autoclose_popup)->ee_win); 16 e_grabinput_release(0, e_comp_get(autoclose_popup)->ee_win);
17 autoclose_popup->autoclose = 0; 17 autoclose_popup->autoclose = 0;
18 } 18 }
19 E_FN_DEL(e_object_del, autoclose_popup); 19 E_FREE_FUNC(autoclose_popup, e_object_del);
20 E_FN_DEL(evas_object_del, event_rect); 20 E_FREE_FUNC(event_rect, evas_object_del);
21 E_FN_DEL(ecore_event_handler_del, key_handler); 21 E_FREE_FUNC(key_handler, ecore_event_handler_del);
22} 22}
23 23
24static void 24static void
@@ -27,7 +27,7 @@ _e_popup_free(E_Popup *pop)
27 e_object_unref(E_OBJECT(pop->zone)); 27 e_object_unref(E_OBJECT(pop->zone));
28 if (pop->autoclose) 28 if (pop->autoclose)
29 _e_popup_autoclose_cleanup(); 29 _e_popup_autoclose_cleanup();
30 E_FN_DEL(e_object_del, pop->shape); 30 E_FREE_FUNC(pop->shape, e_object_del);
31 E_FREE_LIST(pop->objects, evas_object_del); 31 E_FREE_LIST(pop->objects, evas_object_del);
32 pop->zone->popups = eina_list_remove(pop->zone->popups, pop); 32 pop->zone->popups = eina_list_remove(pop->zone->popups, pop);
33 eina_stringshare_del(pop->name); 33 eina_stringshare_del(pop->name);
@@ -56,8 +56,8 @@ _e_popup_autoclose_mouse_up_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas
56static void 56static void
57_e_popup_autoclose_setup(E_Popup *pop) 57_e_popup_autoclose_setup(E_Popup *pop)
58{ 58{
59 E_FN_DEL(e_object_del, autoclose_popup); 59 E_FREE_FUNC(autoclose_popup, e_object_del);
60 E_FN_DEL(evas_object_del, event_rect); 60 E_FREE_FUNC(event_rect, evas_object_del);
61 61
62 event_rect = evas_object_rectangle_add(e_comp_get(pop)->evas); 62 event_rect = evas_object_rectangle_add(e_comp_get(pop)->evas);
63 evas_object_color_set(event_rect, 0, 0, 0, 0); 63 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)
215static void 215static void
216_backlight_popup_free(Instance *inst) 216_backlight_popup_free(Instance *inst)
217{ 217{
218 E_FN_DEL(e_object_del, inst->popup); 218 E_FREE_FUNC(inst->popup, e_object_del);
219} 219}
220 220
221static void 221static 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)
235 const Eina_List *l; 235 const Eina_List *l;
236 Eina_Stringshare *tag; 236 Eina_Stringshare *tag;
237 237
238 E_FN_DEL(ecore_timer_del, reset_timer); 238 E_FREE_FUNC(reset_timer, ecore_timer_del);
239 if (!ctx_click) ctx_click = e_configure_option_ctx_new(); 239 if (!ctx_click) ctx_click = e_configure_option_ctx_new();
240 if (!e_configure_option_ctx_tag_add(ctx_click, data)) return; 240 if (!e_configure_option_ctx_tag_add(ctx_click, data)) return;
241 _ctx_active_update(); 241 _ctx_active_update();
@@ -261,7 +261,7 @@ _cat_sel(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
261 elm_object_disabled_set(back, 0); 261 elm_object_disabled_set(back, 0);
262 if (!ctx_click) ctx_click = e_configure_option_ctx_new(); 262 if (!ctx_click) ctx_click = e_configure_option_ctx_new();
263 ctx_click->category = ctx_active->category = data; 263 ctx_click->category = ctx_active->category = data;
264 E_FN_DEL(ecore_timer_del, reset_timer); 264 E_FREE_FUNC(reset_timer, ecore_timer_del);
265 elm_genlist_clear(list[0]); 265 elm_genlist_clear(list[0]);
266 EINA_LIST_FOREACH(e_configure_option_category_list_tags(data), l, tag) 266 EINA_LIST_FOREACH(e_configure_option_category_list_tags(data), l, tag)
267 { 267 {
@@ -299,8 +299,8 @@ _reset_cb(void *d EINA_UNUSED)
299 ctx_active->match_tags = eina_list_free(ctx_active->match_tags); 299 ctx_active->match_tags = eina_list_free(ctx_active->match_tags);
300 ctx_active->tags = eina_list_free(ctx_active->tags); 300 ctx_active->tags = eina_list_free(ctx_active->tags);
301 ctx_active->opts = eina_list_free(ctx_active->opts); 301 ctx_active->opts = eina_list_free(ctx_active->opts);
302 E_FN_DEL(e_configure_option_ctx_free, ctx_entry); 302 E_FREE_FUNC(ctx_entry, e_configure_option_ctx_free);
303 E_FN_DEL(e_configure_option_ctx_free, ctx_click); 303 E_FREE_FUNC(ctx_click, e_configure_option_ctx_free);
304 EINA_LIST_FOREACH(e_configure_option_category_list(), l, cat) 304 EINA_LIST_FOREACH(e_configure_option_category_list(), l, cat)
305 elm_genlist_item_append(list[0], itc_cats, cat, NULL, 0, _cat_sel, cat); 305 elm_genlist_item_append(list[0], itc_cats, cat, NULL, 0, _cat_sel, cat);
306 elm_object_disabled_set(back, 1); 306 elm_object_disabled_set(back, 1);
@@ -316,9 +316,9 @@ _entry_change_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA
316 Eina_Stringshare *txt, *tag; 316 Eina_Stringshare *txt, *tag;
317 Eina_List *l; 317 Eina_List *l;
318 318
319 E_FN_DEL(ecore_timer_del, reset_timer); 319 E_FREE_FUNC(reset_timer, ecore_timer_del);
320 txt = elm_entry_entry_get(obj); 320 txt = elm_entry_entry_get(obj);
321 E_FN_DEL(evas_object_del, overlay); 321 E_FREE_FUNC(overlay, evas_object_del);
322 if (!ctx_entry) ctx_entry = e_configure_option_ctx_new(); 322 if (!ctx_entry) ctx_entry = e_configure_option_ctx_new();
323 if (!e_configure_option_ctx_update(ctx_entry, txt)) return; 323 if (!e_configure_option_ctx_update(ctx_entry, txt)) return;
324 _ctx_active_update(); 324 _ctx_active_update();
@@ -383,14 +383,14 @@ _back_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
383 Eina_Stringshare *tag; 383 Eina_Stringshare *tag;
384 Eina_Bool cat = EINA_FALSE; 384 Eina_Bool cat = EINA_FALSE;
385 385
386 E_FN_DEL(ecore_timer_del, reset_timer); 386 E_FREE_FUNC(reset_timer, ecore_timer_del);
387 if (overlay) 387 if (overlay)
388 { 388 {
389 evas_object_del(overlay); 389 evas_object_del(overlay);
390 return; 390 return;
391 } 391 }
392 if (!ctx_click) return; 392 if (!ctx_click) return;
393 E_FN_DEL(evas_object_del, overlay); 393 E_FREE_FUNC(overlay, evas_object_del);
394 if (ctx_click->tags) 394 if (ctx_click->tags)
395 { 395 {
396 cat = EINA_TRUE; 396 cat = EINA_TRUE;
@@ -417,14 +417,14 @@ _back_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
417static void 417static void
418_e_conf2_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 418_e_conf2_del(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
419{ 419{
420 E_FN_DEL(elm_genlist_item_class_free, itc_cats); 420 E_FREE_FUNC(itc_cats, elm_genlist_item_class_free);
421 E_FN_DEL(elm_genlist_item_class_free, itc_tags); 421 E_FREE_FUNC(itc_tags, elm_genlist_item_class_free);
422 E_FN_DEL(elm_genlist_item_class_free, itc_opts); 422 E_FREE_FUNC(itc_opts, elm_genlist_item_class_free);
423 E_FN_DEL(elm_genlist_item_class_free, itc_thumb); 423 E_FREE_FUNC(itc_thumb, elm_genlist_item_class_free);
424 E_FN_DEL(e_configure_option_ctx_free, ctx_entry); 424 E_FREE_FUNC(ctx_entry, e_configure_option_ctx_free);
425 E_FN_DEL(e_configure_option_ctx_free, ctx_click); 425 E_FREE_FUNC(ctx_click, e_configure_option_ctx_free);
426 E_FN_DEL(e_configure_option_ctx_free, ctx_active); 426 E_FREE_FUNC(ctx_active, e_configure_option_ctx_free);
427 E_FN_DEL(ecore_timer_del, reset_timer); 427 E_FREE_FUNC(reset_timer, ecore_timer_del);
428 list[0] = list[1] = layout = overlay = back = entry = NULL; 428 list[0] = list[1] = layout = overlay = back = entry = NULL;
429 E_FREE_LIST(handlers, ecore_event_handler_del); 429 E_FREE_LIST(handlers, ecore_event_handler_del);
430 e_configure_option_reset_all(); 430 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)
232 E_FREE_LIST(cfdata->apps, efreet_desktop_free); 232 E_FREE_LIST(cfdata->apps, efreet_desktop_free);
233 eina_list_free(cfdata->apps_user.icons); 233 eina_list_free(cfdata->apps_user.icons);
234 eina_list_free(cfdata->apps_xdg.icons); 234 eina_list_free(cfdata->apps_xdg.icons);
235 E_FN_DEL(ecore_idler_del, cfdata->apps_user.idler); 235 E_FREE_FUNC(cfdata->apps_user.idler, ecore_idler_del);
236 E_FN_DEL(ecore_idler_del, cfdata->apps_xdg.idler); 236 E_FREE_FUNC(cfdata->apps_xdg.idler, ecore_idler_del);
237 e_widget_ilist_clear(cfdata->apps_xdg.o_list); 237 e_widget_ilist_clear(cfdata->apps_xdg.o_list);
238 /* FIXME: this is suuuuper slow and blocking :/ */ 238 /* FIXME: this is suuuuper slow and blocking :/ */
239 e_widget_ilist_clear(cfdata->apps_user.o_list); 239 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)
294void 294void
295econnman_popup_del(E_Connman_Instance *inst) 295econnman_popup_del(E_Connman_Instance *inst)
296{ 296{
297 E_FN_DEL(e_object_del, inst->popup); 297 E_FREE_FUNC(inst->popup, e_object_del);
298} 298}
299 299
300static void 300static 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)
88void 88void
89music_control_popup_del(E_Music_Control_Instance *inst) 89music_control_popup_del(E_Music_Control_Instance *inst)
90{ 90{
91 E_FN_DEL(e_object_del, inst->popup); 91 E_FREE_FUNC(inst->popup, e_object_del);
92} 92}
93 93
94struct _E_Config_Dialog_Data 94struct _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__)
1001 e_object_del(E_OBJECT(win)); 1001 e_object_del(E_OBJECT(win));
1002 win = NULL; 1002 win = NULL;
1003 } 1003 }
1004 E_FN_DEL(e_object_del, cd); 1004 E_FREE_FUNC(cd, e_object_del);
1005 if (timer) 1005 if (timer)
1006 { 1006 {
1007 ecore_timer_del(timer); 1007 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)
256 256
257 E_FREE_LIST(_handlers, ecore_event_handler_del); 257 E_FREE_LIST(_handlers, ecore_event_handler_del);
258 258
259 E_FN_DEL(ecore_timer_del, _scroll_timer); 259 E_FREE_FUNC(_scroll_timer, ecore_timer_del);
260 E_FN_DEL(ecore_animator_del, _animator); 260 E_FREE_FUNC(_animator, ecore_animator_del);
261 261
262 ecore_x_window_free(_input_window); 262 ecore_x_window_free(_input_window);
263 e_grabinput_release(_input_window, _input_window); 263 e_grabinput_release(_input_window, _input_window);
@@ -1004,7 +1004,7 @@ _e_winlist_activate(void)
1004 } 1004 }
1005 else 1005 else
1006 { 1006 {
1007 E_FN_DEL(ecore_animator_del, _animator); 1007 E_FREE_FUNC(_animator, ecore_animator_del);
1008 } 1008 }
1009 1009
1010 if ((!ww->border->lock_user_stacking) && 1010 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)
152 e_config_xkb_layout_free(inst->layout); 152 e_config_xkb_layout_free(inst->layout);
153 inst->layout = e_config->xkb.current_layout; 153 inst->layout = e_config->xkb.current_layout;
154 } 154 }
155 E_FN_DEL(evas_object_del, inst->o_xkbflag); 155 E_FREE_FUNC(inst->o_xkbflag, evas_object_del);
156 e_theme_edje_object_set(inst->o_xkbswitch, 156 e_theme_edje_object_set(inst->o_xkbswitch,
157 "base/theme/modules/xkbswitch", 157 "base/theme/modules/xkbswitch",
158 "e/modules/xkbswitch/noflag"); 158 "e/modules/xkbswitch/noflag");