enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Luncher: Use E_FREE_FUNC to del variables that are checked for null.

This commit is contained in:
Stephen okra Houston 2016-11-04 10:07:13 -05:00
parent 353ad6be11
commit 6c28cf2e51
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/luncher/bar.c
View File

@ -426,15 +426,13 @@ _bar_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUS
if (ev->button == 1)
{
if (ic->mouse_in_timer)
ecore_timer_del(ic->mouse_in_timer);
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
if (ic->mouse_out_timer)
ecore_timer_del(ic->mouse_out_timer);
ic->mouse_in_timer = NULL;
ic->mouse_out_timer = NULL;
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
ic->drag.x = ev->output.x;
ic->drag.y = ev->output.y;
if (ic->drag_timer)
ecore_timer_del(ic->drag_timer);
E_FREE_FUNC(ic->drag_timer, ecore_timer_del);
ic->drag_timer = ecore_timer_add(.35, _bar_drag_timer, ic);
}
if (ev->button == 3)
@ -526,7 +524,7 @@ _bar_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED
if (ev->button == 1)
{
if (ic->drag_timer)
ecore_timer_del(ic->drag_timer);
E_FREE_FUNC(ic->drag_timer, ecore_timer_del);
if (ic->drag.dnd)
{
ic->drag.start = 0;
@ -619,7 +617,7 @@ _bar_icon_preview_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EI
if (current_preview_menu)
return;
if (ic->mouse_out_timer)
ecore_timer_del(ic->mouse_out_timer);
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
ic->mouse_out_timer = ecore_timer_add(0.75, _bar_icon_preview_hide, ic);
}
@ -633,8 +631,7 @@ _bar_icon_preview_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN
if (_bar_check_modifiers(ev->modifiers)) return;
if (ic->mouse_out_timer)
ecore_timer_del(ic->mouse_out_timer);
ic->mouse_out_timer = NULL;
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
}
static void
@ -839,10 +836,9 @@ _bar_icon_mouse_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *even
ic->active = EINA_TRUE;
if (ic->mouse_out_timer)
ecore_timer_del(ic->mouse_out_timer);
ic->mouse_out_timer = NULL;
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
if (ic->mouse_in_timer)
ecore_timer_del(ic->mouse_in_timer);
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
if (eina_list_count(ic->execs) || eina_list_count(ic->clients))
clients = EINA_TRUE;
if (current_preview && clients && !current_preview_menu)
@ -873,10 +869,9 @@ _bar_icon_mouse_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *eve
if (!ic->preview)
ic->active = EINA_FALSE;
if (ic->mouse_in_timer)
ecore_timer_del(ic->mouse_in_timer);
ic->mouse_in_timer = NULL;
E_FREE_FUNC(ic->mouse_in_timer, ecore_timer_del);
if (ic->mouse_out_timer)
ecore_timer_del(ic->mouse_out_timer);
E_FREE_FUNC(ic->mouse_out_timer, ecore_timer_del);
ic->mouse_out_timer = ecore_timer_add(0.25, _bar_icon_preview_hide, ic);
}
@ -1534,7 +1529,7 @@ _bar_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev
Instance *inst = data;
if (inst->drop_handler)
evas_object_del(inst->drop_handler);
E_FREE_FUNC(inst->drop_handler, evas_object_del);
luncher_instances = eina_list_remove(luncher_instances, inst);
free(inst);
}
@ -1802,7 +1797,7 @@ _bar_recalculate_job(void *data)
EINTERN void
bar_recalculate(Instance *inst)
{
if (inst->recalc_job) ecore_job_del(inst->recalc_job);
if (inst->recalc_job) E_FREE_FUNC(inst->recalc_job, ecore_job_del);
inst->recalc_job = ecore_job_add(_bar_recalculate_job, inst);
}
@ -1813,7 +1808,7 @@ bar_reorder(Instance *inst)
if (inst)
{
if (inst->recalc_job) ecore_job_del(inst->recalc_job);
if (inst->recalc_job) E_FREE_FUNC(inst->recalc_job, ecore_job_del);
_bar_empty(inst);
if (!inst->cfg->dir)
inst->cfg->dir = eina_stringshare_add("default");