summaryrefslogtreecommitdiff
path: root/src/lib/eio/eio_model.c
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-26 12:15:21 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-12-26 12:31:08 +0100
commit42e886d8d61d551bb544b777e6d254ce4dd3fcf1 (patch)
treed2b509c691ce62f88747e9c34e82dc30d4b9e0d4 /src/lib/eio/eio_model.c
parent0e278d1de8fddcb510a19010fa829dcc1e7f393c (diff)
Revert "ecore: make efl_loop_promise_new a function of Efl.Loop_Consumer."
This reverts commit 9b5155c9f135f9ef450a817979f5884352b2d4c0. For now lets revert this, this breaks copy and paste, further more it has the potential to break a lot more things, as eio_model tends to use efl_loop_promise new, and then eina_promise_data_set, which is explicitly forbidden. This fixes crashing terminology instances.
Diffstat (limited to 'src/lib/eio/eio_model.c')
-rw-r--r--src/lib/eio/eio_model.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index c6e03e6..309af24 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -417,7 +417,7 @@ _build_delay(Efl_Loop *loop)
417{ 417{
418 Eina_Promise *p; 418 Eina_Promise *p;
419 419
420 p = eina_promise_new(efl_loop_future_scheduler_get(loop), _cancel_request, NULL); 420 p = efl_loop_promise_new(loop, _cancel_request, NULL);
421 421
422 if (!delayed_queue) 422 if (!delayed_queue)
423 { 423 {
@@ -682,7 +682,7 @@ _eio_model_efl_model_property_set(Eo *obj,
682 682
683 if (finalized) 683 if (finalized)
684 { 684 {
685 Eina_Promise *p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 685 Eina_Promise *p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
686 f = eina_future_new(p); 686 f = eina_future_new(p);
687 687
688 pd->request.move = eio_file_move(pd->path, path, 688 pd->request.move = eio_file_move(pd->path, path,