diff options
| author | Cedric Bail <cedric@osg.samsung.com> | 2016-09-15 21:51:15 -0700 |
|---|---|---|
| committer | Cedric Bail <cedric@osg.samsung.com> | 2016-09-15 21:51:15 -0700 |
| commit | 802b14603802273d77e04a0b6b7017b49b314266 (patch) | |
| tree | 0d2d66c042f3f379eb6b8c76d9775cc1c7d3a028 | |
| parent | 95093095f3ed2d5be9b9450cdb5d1d52dc03e5b5 (diff) | |
| download | efl-802b14603802273d77e04a0b6b7017b49b314266.tar.gz | |
ecore_con: forgotten update of Eina_Promise to Efl_Future convertion due to git rebase.
| -rw-r--r-- | src/lib/ecore/efl_io_copier.c | 4 | ||||
| -rw-r--r-- | src/lib/ecore_con/efl_net_dialer_tcp.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c index e3972da539..8a4405273b 100644 --- a/src/lib/ecore/efl_io_copier.c +++ b/src/lib/ecore/efl_io_copier.c @@ -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; } diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c index c9800d9840..d9dd70cee6 100644 --- a/src/lib/ecore_con/efl_net_dialer_tcp.c +++ b/src/lib/ecore_con/efl_net_dialer_tcp.c @@ -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; |