dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Use efl_unref() on duplicated event objects 

efl_del() is valid but bindings such as C++ should be using efl_unref()
and not efl_del() in this situation: a reference was given, so it should
be released.
This commit is contained in:
Jean-Philippe Andre 2017-09-28 16:50:53 +09:00
parent f7a7a29cc0
commit ce84604068
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/bin/elementary/test_events.c
View File

@ -21,7 +21,7 @@ _pointer_down(void *data, const Efl_Event *ev)
{ {
testdata *td = data; testdata *td = data;
td->down = 1; td->down = 1;
efl_del(td->evdown); efl_unref(td->evdown);
td->evdown = efl_input_dup(ev->info); td->evdown = efl_input_dup(ev->info);
} }
@ -29,7 +29,7 @@ static void
_pointer_move(void *data, const Efl_Event *ev) _pointer_move(void *data, const Efl_Event *ev)
{ {
testdata *td = data; testdata *td = data;
efl_del(td->evmove); efl_unref(td->evmove);
td->evmove = efl_input_dup(ev->info); td->evmove = efl_input_dup(ev->info);
} }
@ -38,7 +38,7 @@ _pointer_up(void *data, const Efl_Event *ev)
{ {
testdata *td = data; testdata *td = data;
td->down = 0; td->down = 0;
efl_del(td->evup); efl_unref(td->evup);
td->evup = efl_input_dup(ev->info); td->evup = efl_input_dup(ev->info);
} }
@ -63,7 +63,7 @@ _key_down(void *data, const Efl_Event *ev)
if (!efl_input_fake_get(ev->info)) if (!efl_input_fake_get(ev->info))
{ {
efl_del(td->evkeydown); efl_unref(td->evkeydown);
td->evkeydown = efl_input_dup(ev->info); td->evkeydown = efl_input_dup(ev->info);
} }
} }
@ -83,7 +83,7 @@ _key_up(void *data, const Efl_Event *ev)
if (!efl_input_fake_get(ev->info)) if (!efl_input_fake_get(ev->info))
{ {
efl_del(td->evkeyup); efl_unref(td->evkeyup);
td->evkeyup = efl_input_dup(ev->info); td->evkeyup = efl_input_dup(ev->info);
} }
@ -131,8 +131,8 @@ _clicked_button2(void *data, const Efl_Event *ev EINA_UNUSED)
{ {
efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown); efl_event_callback_call(td->win, EFL_EVENT_KEY_DOWN, td->evkeydown);
efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup); efl_event_callback_call(td->win, EFL_EVENT_KEY_UP, td->evkeyup);
efl_del(td->evkeydown); efl_unref(td->evkeydown);
efl_del(td->evkeyup); efl_unref(td->evkeyup);
td->evkeydown = NULL; td->evkeydown = NULL;
td->evkeyup = NULL; td->evkeyup = NULL;
} }
@ -142,11 +142,11 @@ static void
_win_del(void *data, const Efl_Event *ev EINA_UNUSED) _win_del(void *data, const Efl_Event *ev EINA_UNUSED)
{ {
testdata *td = data; testdata *td = data;
efl_del(td->evdown); efl_unref(td->evdown);
efl_del(td->evup); efl_unref(td->evup);
efl_del(td->evmove); efl_unref(td->evmove);
efl_del(td->evkeydown); efl_unref(td->evkeydown);
efl_del(td->evkeyup); efl_unref(td->evkeyup);
free(td); free(td);
} }