summaryrefslogtreecommitdiff
path: root/src/lib/eio
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
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')
-rw-r--r--src/lib/eio/efl_io_manager.c18
-rw-r--r--src/lib/eio/eio_model.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 9dcdfee..6ac1746 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -119,7 +119,7 @@ _efl_io_manager_direct_ls(const Eo *obj,
119 Eina_Future *future; 119 Eina_Future *future;
120 Eio_File *h; 120 Eio_File *h;
121 121
122 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 122 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
123 if (!p) return NULL; 123 if (!p) return NULL;
124 future = eina_future_new(p); 124 future = eina_future_new(p);
125 125
@@ -162,7 +162,7 @@ _efl_io_manager_stat_ls(const Eo *obj,
162 Eina_Future *future; 162 Eina_Future *future;
163 Eio_File *h; 163 Eio_File *h;
164 164
165 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 165 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
166 if (!p) return NULL; 166 if (!p) return NULL;
167 future = eina_future_new(p); 167 future = eina_future_new(p);
168 168
@@ -204,7 +204,7 @@ _efl_io_manager_ls(const Eo *obj,
204 Eina_Future *future; 204 Eina_Future *future;
205 Eio_File *h; 205 Eio_File *h;
206 206
207 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 207 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
208 if (!p) return NULL; 208 if (!p) return NULL;
209 future = eina_future_new(p); 209 future = eina_future_new(p);
210 210
@@ -256,7 +256,7 @@ _efl_io_manager_stat(const Eo *obj,
256 Eina_Future *future; 256 Eina_Future *future;
257 Eio_File *h; 257 Eio_File *h;
258 258
259 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 259 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
260 if (!p) return NULL; 260 if (!p) return NULL;
261 future = eina_future_new(p); 261 future = eina_future_new(p);
262 262
@@ -285,7 +285,7 @@ _efl_io_manager_xattr_ls(const Eo *obj,
285 Eina_Future *future; 285 Eina_Future *future;
286 Eio_File *h; 286 Eio_File *h;
287 287
288 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 288 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
289 if (!p) return NULL; 289 if (!p) return NULL;
290 future = eina_future_new(p); 290 future = eina_future_new(p);
291 291
@@ -336,7 +336,7 @@ _efl_io_manager_xattr_set(Eo *obj,
336 Eina_Future *future; 336 Eina_Future *future;
337 Eio_File *h; 337 Eio_File *h;
338 338
339 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 339 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
340 if (!p) return NULL; 340 if (!p) return NULL;
341 future = eina_future_new(p); 341 future = eina_future_new(p);
342 342
@@ -366,7 +366,7 @@ _efl_io_manager_xattr_get(const Eo *obj,
366 Eina_Future *future; 366 Eina_Future *future;
367 Eio_File *h; 367 Eio_File *h;
368 368
369 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 369 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
370 if (!p) return NULL; 370 if (!p) return NULL;
371 future = eina_future_new(p); 371 future = eina_future_new(p);
372 372
@@ -405,7 +405,7 @@ _efl_io_manager_open(const Eo *obj,
405 Eina_Future *future; 405 Eina_Future *future;
406 Eio_File *h; 406 Eio_File *h;
407 407
408 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 408 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
409 if (!p) return NULL; 409 if (!p) return NULL;
410 future = eina_future_new(p); 410 future = eina_future_new(p);
411 411
@@ -431,7 +431,7 @@ _efl_io_manager_close(const Eo *obj,
431 Eina_Future *future; 431 Eina_Future *future;
432 Eio_File *h; 432 Eio_File *h;
433 433
434 p = eina_promise_new(efl_loop_future_scheduler_get(obj), _efl_io_manager_future_cancel, NULL); 434 p = efl_loop_promise_new(obj, _efl_io_manager_future_cancel, NULL);
435 if (!p) return NULL; 435 if (!p) return NULL;
436 future = eina_future_new(p); 436 future = eina_future_new(p);
437 437
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,