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

ecore_con: forgotten update of Eina_Promise to Efl_Future convertion due to git rebase.

This commit is contained in:
Cedric Bail 2016-09-15 21:51:15 -07:00
parent 95093095f3
commit 802b146038
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ecore/efl_io_copier.c
View File

@ -574,7 +574,7 @@ _efl_io_copier_efl_io_closer_close(Eo *o, Efl_Io_Copier_Data *pd)
if (pd->job)
{
eina_promise_cancel(pd->job);
efl_future_cancel(pd->job);
pd->job = NULL;
}
@ -697,7 +697,7 @@ _efl_io_copier_efl_object_destructor(Eo *o, Efl_Io_Copier_Data *pd)
if (pd->job)
{
eina_promise_cancel(pd->job);
efl_future_cancel(pd->job);
pd->job = NULL;
}

8
src/lib/ecore_con/efl_net_dialer_tcp.c
View File

@ -67,7 +67,7 @@ _efl_net_dialer_tcp_efl_object_destructor(Eo *o, Efl_Net_Dialer_Tcp_Data *pd)
if (pd->connect.timeout)
{
eina_promise_cancel(pd->connect.timeout);
efl_future_cancel(pd->connect.timeout);
pd->connect.timeout = NULL;
}
@ -286,7 +286,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_
if (pd->connect.timeout)
{
eina_promise_cancel(pd->connect.timeout);
efl_future_cancel(pd->connect.timeout);
pd->connect.timeout = NULL;
}
if (pd->timeout_dial > 0.0)
@ -329,7 +329,7 @@ _efl_net_dialer_tcp_efl_net_dialer_timeout_dial_set(Eo *o EINA_UNUSED, Efl_Net_D
pd->timeout_dial = seconds;
if (pd->connect.timeout)
{
eina_promise_cancel(pd->connect.timeout);
efl_future_cancel(pd->connect.timeout);
pd->connect.timeout = NULL;
}
if (pd->timeout_dial > 0.0)
@ -350,7 +350,7 @@ _efl_net_dialer_tcp_efl_net_dialer_connected_set(Eo *o, Efl_Net_Dialer_Tcp_Data
{
if (pd->connect.timeout)
{
eina_promise_cancel(pd->connect.timeout);
efl_future_cancel(pd->connect.timeout);
pd->connect.timeout = NULL;
}
if (pd->connected == connected) return;