summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-07 14:52:41 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-11-09 11:43:59 +0000
commit665a75378fcb791600043b5c84e68f441aaaf5d3 (patch)
tree3e5f28ef48f512bec3f01adb5449aa1bd4f7a83c /src
parentf80b8979ba11ade8e5c9365d4464eebc57cd50c3 (diff)
xxx - fix eina_future_then calls to pass sotrage val - fix warns
Diffstat (limited to 'src')
-rw-r--r--src/bin/elementary/test_events.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/lib/ecore/efl_loop.c2
-rw-r--r--src/lib/ecore/efl_model_composite_boolean.c4
-rw-r--r--src/lib/ecore/efl_model_composite_selection.c20
-rw-r--r--src/lib/eina/eina_promise.c4
-rw-r--r--src/lib/eio/eio_model.c6
-rw-r--r--src/lib/elementary/efl_ui_list_view.c2
-rw-r--r--src/lib/elementary/efl_ui_list_view_precise_layouter.c2
-rw-r--r--src/lib/elementary/efl_ui_scroll_manager.c2
-rw-r--r--src/lib/elementary/elc_fileselector.c6
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c2
-rw-r--r--src/lib/elementary/elm_view_list.c4
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c4
-rw-r--r--src/tests/efl/efl_test_model_composite.c6
-rw-r--r--src/tests/efl/efl_test_model_container.c2
-rw-r--r--src/tests/eio/eio_model_test_file.c8
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c4
-rw-r--r--src/tests/eio/eio_test_manager.c12
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c6
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c10
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_connection.c6
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_object.c8
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_proxy.c2
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c2
-rw-r--r--src/tests/elementary/elm_test_layout.c2
27 files changed, 67 insertions, 67 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index b9fc394980..661a8107f1 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -94,7 +94,7 @@ _key_up(void *data, const Efl_Event *ev)
94 94
95 if (td->f) eina_future_cancel(td->f); 95 if (td->f) eina_future_cancel(td->f);
96 td->f = efl_loop_timeout(efl_provider_find(ev->object, EFL_LOOP_CLASS), 0.5); 96 td->f = efl_loop_timeout(efl_provider_find(ev->object, EFL_LOOP_CLASS), 0.5);
97 eina_future_then(td->f, _ecore_timeout_cb, td); 97 eina_future_then(td->f, _ecore_timeout_cb, td, NULL);
98} 98}
99 99
100static void 100static void
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index 72b0ba343e..369dc89390 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -238,7 +238,7 @@ _code_changed_hack(void *data, const Efl_Event *ev EINA_UNUSED)
238 Eina_Future *f; 238 Eina_Future *f;
239 239
240 f = eina_future_then(efl_loop_job(efl_loop_get(data)), 240 f = eina_future_then(efl_loop_job(efl_loop_get(data)),
241 _code_changed, data); 241 _code_changed, data, NULL);
242 efl_future_Eina_FutureXXX_then(data, f); 242 efl_future_Eina_FutureXXX_then(data, f);
243} 243}
244 244
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 3c2ca6b7a4..e18bed43a7 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -415,7 +415,7 @@ ecore_loop_arguments_send(int argc, const char **argv)
415 } 415 }
416 416
417 job = eina_future_then(efl_loop_job(efl_main_loop_get()), 417 job = eina_future_then(efl_loop_job(efl_main_loop_get()),
418 _efl_loop_arguments_send, arga); 418 _efl_loop_arguments_send, arga, NULL);
419 efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job); 419 efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
420} 420}
421 421
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c
index 5fd6924668..98dbbe5bb1 100644
--- a/src/lib/ecore/efl_model_composite_boolean.c
+++ b/src/lib/ecore/efl_model_composite_boolean.c
@@ -297,8 +297,8 @@ _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj,
297 req->parent = efl_ref(obj); 297 req->parent = efl_ref(obj);
298 req->start = start; 298 req->start = start;
299 299
300 return efl_future_Eina_FutureXXX_then(obj, 300 return efl_future_Eina_FutureXXX_then
301 eina_future_then(f, _efl_model_composite_boolean_then, req)); 301 (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
302} 302}
303 303
304#include "efl_model_composite_boolean.eo.c" 304#include "efl_model_composite_boolean.eo.c"
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c
index 914a45f90a..14a54cb6fd 100644
--- a/src/lib/ecore/efl_model_composite_selection.c
+++ b/src/lib/ecore/efl_model_composite_selection.c
@@ -131,8 +131,8 @@ _check_child_change(Efl_Model *child, Eina_Bool value)
131 else 131 else
132 { 132 {
133 r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value)); 133 r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value));
134 r = eina_future_then(r, _commit_change, child); 134 r = eina_future_then(r, _commit_change, child, NULL);
135 r = eina_future_then(r, _clear_child, child); 135 r = eina_future_then(r, _clear_child, child, NULL);
136 } 136 }
137 137
138 return r; 138 return r;
@@ -218,9 +218,9 @@ _efl_model_composite_selection_efl_model_property_set(Eo *obj,
218 if (!success) 218 if (!success)
219 return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE); 219 return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
220 220
221 return efl_future_Eina_FutureXXX_then(obj, 221 return efl_future_Eina_FutureXXX_then
222 eina_future_then(efl_model_children_slice_get(obj, l, 1), 222 (obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
223 _select_slice_then, obj)); 223 _select_slice_then, obj, NULL));
224 } 224 }
225 225
226 return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value); 226 return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value);
@@ -281,7 +281,7 @@ _untangle_array(void *data,
281 "selected", eina_value_bool_new(EINA_FALSE)); 281 "selected", eina_value_bool_new(EINA_FALSE));
282 // Once this is done, we need to repropagate the error 282 // Once this is done, we need to repropagate the error
283 eina_value_error_get(&v, error); 283 eina_value_error_get(&v, error);
284 f = eina_future_then(f, _regenerate_error, error); 284 f = eina_future_then(f, _regenerate_error, error, NULL);
285 285
286 return eina_future_as_value(f); 286 return eina_future_as_value(f);
287 } 287 }
@@ -380,14 +380,14 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
380 // There was, need to unselect the previous one along setting the new value 380 // There was, need to unselect the previous one along setting the new value
381 chain = eina_future_all(chain, 381 chain = eina_future_all(chain,
382 eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1), 382 eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1),
383 _unselect_slice_then, NULL)); 383 _unselect_slice_then, NULL, NULL));
384 384
385 chain = eina_future_then(chain, _untangle_array, obj); 385 chain = eina_future_then(chain, _untangle_array, obj, NULL);
386 } 386 }
387 } 387 }
388 388
389 commit_change: 389 commit_change:
390 chain = eina_future_then(chain, _commit_change, obj); 390 chain = eina_future_then(chain, _commit_change, obj, NULL);
391 391
392 return efl_future_Eina_FutureXXX_then(obj, chain); 392 return efl_future_Eina_FutureXXX_then(obj, chain);
393} 393}
@@ -448,7 +448,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
448 // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here 448 // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here
449 f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS), 449 f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS),
450 start, count); 450 start, count);
451 f = eina_future_then(f, _slice_get, req); 451 f = eina_future_then(f, _slice_get, req, NULL);
452 452
453 return efl_future_Eina_FutureXXX_then(obj, f); 453 return efl_future_Eina_FutureXXX_then(obj, f);
454} 454}
diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c
index d771581e06..b9adbe8e4d 100644
--- a/src/lib/eina/eina_promise.c
+++ b/src/lib/eina/eina_promise.c
@@ -686,7 +686,7 @@ eina_future_as_value(Eina_Future *f)
686 EINA_FUTURE_CHECK_RETURN_VAL(f, v); 686 EINA_FUTURE_CHECK_RETURN_VAL(f, v);
687 p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL); 687 p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL);
688 EINA_SAFETY_ON_NULL_GOTO(p, err_promise); 688 EINA_SAFETY_ON_NULL_GOTO(p, err_promise);
689 r_future = eina_future_then(f, _future_proxy, p); 689 r_future = eina_future_then(f, _future_proxy, p, NULL);
690 //If eina_future_then() fails f will be cancelled 690 //If eina_future_then() fails f will be cancelled
691 EINA_SAFETY_ON_NULL_GOTO(r_future, err_future); 691 EINA_SAFETY_ON_NULL_GOTO(r_future, err_future);
692 692
@@ -1305,7 +1305,7 @@ promise_proxy_of_future_array_create(Eina_Future *array[],
1305 1305
1306 for (i = 0; i < ctx->futures_len; i++) 1306 for (i = 0; i < ctx->futures_len; i++)
1307 { 1307 {
1308 ctx->futures[i] = eina_future_then(array[i], future_cb, ctx); 1308 ctx->futures[i] = eina_future_then(array[i], future_cb, ctx, NULL);
1309 //Futures will be cancelled by the caller... 1309 //Futures will be cancelled by the caller...
1310 EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then); 1310 EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then);
1311 } 1311 }
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c
index 3b3c2bea3d..62e52f46dd 100644
--- a/src/lib/eio/eio_model.c
+++ b/src/lib/eio/eio_model.c
@@ -455,7 +455,7 @@ _eio_build_mime_now(void *data, const Eina_Value v, const Eina_Future *dead_futu
455 if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004) 455 if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004)
456 { 456 {
457 Eina_Future *f = eina_future_then(_build_delay(pd->loop), 457 Eina_Future *f = eina_future_then(_build_delay(pd->loop),
458 _eio_build_mime_now, model); 458 _eio_build_mime_now, model, NULL);
459 return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f)); 459 return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f));
460 } 460 }
461 461
@@ -484,7 +484,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
484 efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop); 484 efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop);
485 485
486 f = efl_loop_job(pd->loop); 486 f = efl_loop_job(pd->loop);
487 f = eina_future_then(f, _eio_build_mime_now, model); 487 f = eina_future_then(f, _eio_build_mime_now, model, NULL);
488 pd->request.mime = efl_future_Eina_FutureXXX_then(model, f); 488 pd->request.mime = efl_future_Eina_FutureXXX_then(model, f);
489} 489}
490 490
@@ -808,7 +808,7 @@ _eio_model_efl_model_children_count_get(const Eo *obj, Eio_Model_Data *pd)
808 808
809 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE, 809 f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
810 (void*) obj, _eio_model_children_list, NULL); 810 (void*) obj, _eio_model_children_list, NULL);
811 f = eina_future_then(f, _eio_model_children_list_on, pd); 811 f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
812 pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f); 812 pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
813 } 813 }
814 814
diff --git a/src/lib/elementary/efl_ui_list_view.c b/src/lib/elementary/efl_ui_list_view.c
index 515f49c8ac..e76ce05067 100644
--- a/src/lib/elementary/efl_ui_list_view.c
+++ b/src/lib/elementary/efl_ui_list_view.c
@@ -997,7 +997,7 @@ _efl_ui_list_view_efl_ui_list_view_model_load_range_set(Eo* obj, Efl_Ui_List_Vie
997 if (efl_model_children_count_get(pd->model)) 997 if (efl_model_children_count_get(pd->model))
998 { 998 {
999 Eina_Future *f = efl_model_children_slice_get(pd->model, first, count); 999 Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
1000 f = eina_future_then(f, _children_slice_then, pd); 1000 f = eina_future_then(f, _children_slice_then, pd, NULL);
1001 pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f); 1001 pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f);
1002 } 1002 }
1003} 1003}
diff --git a/src/lib/elementary/efl_ui_list_view_precise_layouter.c b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
index e192d7a9bc..3beac4d468 100644
--- a/src/lib/elementary/efl_ui_list_view_precise_layouter.c
+++ b/src/lib/elementary/efl_ui_list_view_precise_layouter.c
@@ -245,7 +245,7 @@ _child_added_cb(void *data, const Efl_Event *event)
245 r->pd = pd; 245 r->pd = pd;
246 246
247 f = efl_model_children_slice_get(pd->model, evt->index, 1); 247 f = efl_model_children_slice_get(pd->model, evt->index, 1);
248 f = eina_future_then(f, _children_get, r); 248 f = eina_future_then(f, _children_get, r, NULL);
249} 249}
250 250
251static void 251static void
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c b/src/lib/elementary/efl_ui_scroll_manager.c
index 25c2787876..21d2c032de 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -738,7 +738,7 @@ _scroll_wheel_post_event_go(Efl_Ui_Scroll_Manager_Data *sd, int x, int y)
738 Eina_Future *f; 738 Eina_Future *f;
739 739
740 f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)), 740 f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
741 _scroll_wheel_post_event_job, sd); 741 _scroll_wheel_post_event_job, sd, NULL);
742 efl_future_Eina_FutureXXX_then(sd->obj, f); 742 efl_future_Eina_FutureXXX_then(sd->obj, f);
743 } 743 }
744 else 744 else
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1cbb41cea8..274dcd87bd 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1031,7 +1031,7 @@ _populate(Evas_Object *obj,
1031 if (efl_model_children_count_get(model)) 1031 if (efl_model_children_count_get(model))
1032 { 1032 {
1033 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model)); 1033 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
1034 future = eina_future_then(future, _process_children_cb, lreq); 1034 future = eina_future_then(future, _process_children_cb, lreq, NULL);
1035 efl_future_Eina_FutureXXX_then(obj, future); 1035 efl_future_Eina_FutureXXX_then(obj, future);
1036 } 1036 }
1037 else 1037 else
@@ -1498,7 +1498,7 @@ _on_text_activated(void *data, const Efl_Event *event)
1498 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path)); 1498 efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
1499 efl_key_ref_set(fs, _text_activated_model_key, model); 1499 efl_key_ref_set(fs, _text_activated_model_key, model);
1500 efl_ref(fs); 1500 efl_ref(fs);
1501 eina_future_then(future, _on_text_activated_set_path_then, fs); 1501 eina_future_then(future, _on_text_activated_set_path_then, fs, NULL);
1502 1502
1503 elm_object_focus_set(event->object, EINA_FALSE); 1503 elm_object_focus_set(event->object, EINA_FALSE);
1504} 1504}
@@ -1687,7 +1687,7 @@ _resource_created(void *data, const Efl_Event *event)
1687 return; 1687 return;
1688 1688
1689 f = efl_model_children_slice_get(sd->model, evt->index, 1); 1689 f = efl_model_children_slice_get(sd->model, evt->index, 1);
1690 f = eina_future_then(f, _resource_created_then, fs); 1690 f = eina_future_then(f, _resource_created_then, fs, NULL);
1691 efl_future_Eina_FutureXXX_then(fs, f); 1691 efl_future_Eina_FutureXXX_then(fs, f);
1692} 1692}
1693 1693
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index f5fc08361d..022e03ef7a 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2004,7 +2004,7 @@ _scroll_wheel_post_event_go(Elm_Scrollable_Smart_Interface_Data *sid, int x, int
2004 Eina_Future *f; 2004 Eina_Future *f;
2005 2005
2006 f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)), 2006 f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
2007 _scroll_wheel_post_event_job, sid); 2007 _scroll_wheel_post_event_job, sid, NULL);
2008 efl_future_Eina_FutureXXX_then(sid->obj, f); 2008 efl_future_Eina_FutureXXX_then(sid->obj, f);
2009 } 2009 }
2010 else 2010 else
diff --git a/src/lib/elementary/elm_view_list.c b/src/lib/elementary/elm_view_list.c
index 4360fa1d20..709c1fdfe8 100644
--- a/src/lib/elementary/elm_view_list.c
+++ b/src/lib/elementary/elm_view_list.c
@@ -284,7 +284,7 @@ _efl_model_load_children(View_List_ItemData *pdata)
284 284
285 f = efl_model_children_slice_get(pdata->priv->connect.model, 0, 285 f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
286 efl_model_children_count_get(pdata->priv->connect.model)); 286 efl_model_children_count_get(pdata->priv->connect.model));
287 f = eina_future_then(f, _efl_model_load_children_then, pdata); 287 f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
288 efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f); 288 efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f);
289} 289}
290 290
@@ -317,7 +317,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
317 Eina_Future *f; 317 Eina_Future *f;
318 318
319 f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1); 319 f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
320 f = eina_future_then(f, _efl_model_load_children_then, idata); 320 f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
321 efl_future_Eina_FutureXXX_then(idata->priv->genlist, f); 321 efl_future_Eina_FutureXXX_then(idata->priv->genlist, f);
322} 322}
323 323
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 11ed3d7c97..5551508288 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -118,7 +118,7 @@ _timeout(void *data,
118 { \ 118 { \
119 Eina_Bool _did_timeout = EINA_FALSE; \ 119 Eina_Bool _did_timeout = EINA_FALSE; \
120 Eina_Future *_timeout_future = efl_loop_timeout(efl_main_loop_get(), t); \ 120 Eina_Future *_timeout_future = efl_loop_timeout(efl_main_loop_get(), t); \
121 eina_future_then(_timeout_future, _timeout, &_did_timeout); \ 121 eina_future_then(_timeout_future, _timeout, &_did_timeout, NULL); \
122 mark_point(); \ 122 mark_point(); \
123 ecore_main_loop_begin(); \ 123 ecore_main_loop_begin(); \
124 if (!_did_timeout) eina_future_cancel(_timeout_future); \ 124 if (!_did_timeout) eina_future_cancel(_timeout_future); \
@@ -239,7 +239,7 @@ _resolve(struct resolve_ctx *ctx, const char *address, int family, int flags)
239 ctx->future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS, 239 ctx->future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS,
240 address, family, flags); 240 address, family, flags);
241 ck_assert_ptr_ne(ctx->future, NULL); 241 ck_assert_ptr_ne(ctx->future, NULL);
242 ctx->future = eina_future_then(ctx->future, _resolve_done, ctx); 242 ctx->future = eina_future_then(ctx->future, _resolve_done, ctx, NULL);
243 243
244 LOOP_WITH_TIMEOUT(10); 244 LOOP_WITH_TIMEOUT(10);
245} 245}
diff --git a/src/tests/efl/efl_test_model_composite.c b/src/tests/efl/efl_test_model_composite.c
index bbc21bfac2..a4ce5ba576 100644
--- a/src/tests/efl/efl_test_model_composite.c
+++ b/src/tests/efl/efl_test_model_composite.c
@@ -126,7 +126,7 @@ EFL_START_TEST(efl_test_model_composite_boolean)
126 ck_assert(!!model); 126 ck_assert(!!model);
127 127
128 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model)); 128 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
129 eina_future_then(future, _children_slice_get_then, NULL); 129 eina_future_then(future, _children_slice_get_then, NULL, NULL);
130 130
131 ecore_main_loop_begin(); 131 ecore_main_loop_begin();
132} 132}
@@ -166,11 +166,11 @@ EFL_START_TEST(efl_test_model_composite_selection)
166 efl_ui_view_model_set(efl_added, base_model)); 166 efl_ui_view_model_set(efl_added, base_model));
167 ck_assert(!!model); 167 ck_assert(!!model);
168 future = efl_model_property_set(model, "selected", eina_value_int_new(2)); 168 future = efl_model_property_set(model, "selected", eina_value_int_new(2));
169 eina_future_then(future, _wait_propagate, NULL); 169 eina_future_then(future, _wait_propagate, NULL, NULL);
170 ecore_main_loop_begin(); 170 ecore_main_loop_begin();
171 171
172 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model)); 172 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
173 eina_future_then(future, _selection_children_slice_get_then, NULL); 173 eina_future_then(future, _selection_children_slice_get_then, NULL, NULL);
174 174
175 ecore_main_loop_begin(); 175 ecore_main_loop_begin();
176} 176}
diff --git a/src/tests/efl/efl_test_model_container.c b/src/tests/efl/efl_test_model_container.c
index 0ccd34167a..dbe76d8e4f 100644
--- a/src/tests/efl/efl_test_model_container.c
+++ b/src/tests/efl/efl_test_model_container.c
@@ -107,7 +107,7 @@ EFL_START_TEST(efl_test_model_container_values)
107 107
108 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model)); 108 future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
109 109
110 eina_future_then(future, _children_slice_future_then, NULL); 110 eina_future_then(future, _children_slice_future_then, NULL, NULL);
111 111
112 ecore_main_loop_begin(); 112 ecore_main_loop_begin();
113} 113}
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 4a7ac7d8f7..53e941fe2c 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -92,12 +92,12 @@ listing(void *data,
92 if (efl_model_children_count_get(filemodel) == 0) 92 if (efl_model_children_count_get(filemodel) == 0)
93 { 93 {
94 future = efl_loop_job(efl_provider_find(filemodel, EFL_LOOP_CLASS)); 94 future = efl_loop_job(efl_provider_find(filemodel, EFL_LOOP_CLASS));
95 future = eina_future_then(future, listing, filemodel); 95 future = eina_future_then(future, listing, filemodel, NULL);
96 } 96 }
97 else 97 else
98 { 98 {
99 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel)); 99 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
100 future = eina_future_then(future, &promise_then_accessor, NULL); 100 future = eina_future_then(future, &promise_then_accessor, NULL, NULL);
101 } 101 }
102 102
103 return eina_future_as_value(future); 103 return eina_future_as_value(future);
@@ -122,8 +122,8 @@ setup_waiter(Efl_Model *model)
122 122
123 if (listingf) return ; 123 if (listingf) return ;
124 listingf = efl_loop_job(loop); 124 listingf = efl_loop_job(loop);
125 listingf = eina_future_then(listingf, listing, model); 125 listingf = eina_future_then(listingf, listing, model, NULL);
126 listingf = eina_future_then(listingf, clearup, NULL); 126 listingf = eina_future_then(listingf, clearup, NULL, NULL);
127} 127}
128 128
129static void 129static void
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index 392aa31f0f..aeaaad0229 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -76,7 +76,7 @@ _children_added_cb(void *d EINA_UNUSED, const Efl_Event* event)
76 Eina_Future *future; 76 Eina_Future *future;
77 77
78 future = efl_model_children_slice_get(event->object, evt->index, 1); 78 future = efl_model_children_slice_get(event->object, evt->index, 1);
79 eina_future_then(future, _children_get, event->object); 79 eina_future_then(future, _children_get, event->object, NULL);
80} 80}
81 81
82static Eina_Value 82static Eina_Value
@@ -111,7 +111,7 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
111 111
112 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel)); 112 future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
113 113
114 eina_future_then(future, &_create_file, NULL); 114 eina_future_then(future, &_create_file, NULL, NULL);
115 115
116 ecore_main_loop_begin(); 116 ecore_main_loop_begin();
117 117
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 0a849adcc8..ec51f7ce61 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -174,7 +174,7 @@ _test_ls(Eina_Future *(*func)(const Eo *obj, const char *path, Eina_Bool recursi
174 f = func(job, test_dirname, EINA_FALSE, &main_files, _progress_cb, NULL); 174 f = func(job, test_dirname, EINA_FALSE, &main_files, _progress_cb, NULL);
175 fail_if(!f); 175 fail_if(!f);
176 test_count = expected_test_count; 176 test_count = expected_test_count;
177 eina_future_then(f, &_done_cb, &main_files); 177 eina_future_then(f, &_done_cb, &main_files, NULL);
178 178
179 ecore_main_loop_begin(); 179 ecore_main_loop_begin();
180 180
@@ -183,7 +183,7 @@ _test_ls(Eina_Future *(*func)(const Eo *obj, const char *path, Eina_Bool recursi
183 183
184 f = func(job, test_dirname, EINA_TRUE, &main_files, _progress_cb, NULL); 184 f = func(job, test_dirname, EINA_TRUE, &main_files, _progress_cb, NULL);
185 test_count = expected_test_count + 4; 185 test_count = expected_test_count + 4;
186 eina_future_then(f, &_done_cb, &main_files); 186 eina_future_then(f, &_done_cb, &main_files, NULL);
187 187
188 ecore_main_loop_begin(); 188 ecore_main_loop_begin();
189 189
@@ -214,12 +214,12 @@ EFL_START_TEST(efl_io_manager_test_stat)
214 214
215 // Start testing 215 // Start testing
216 f = efl_io_manager_stat(job, nested_dirname); 216 f = efl_io_manager_stat(job, nested_dirname);
217 eina_future_then(f, _stat_done_cb, &is_dir); 217 eina_future_then(f, _stat_done_cb, &is_dir, NULL);
218 ecore_main_loop_begin(); 218 ecore_main_loop_begin();
219 219
220 is_dir = EINA_FALSE; 220 is_dir = EINA_FALSE;
221 f = efl_io_manager_stat(job, nested_filename); 221 f = efl_io_manager_stat(job, nested_filename);
222 eina_future_then(f, _stat_done_cb, &is_dir); 222 eina_future_then(f, _stat_done_cb, &is_dir, NULL);
223 ecore_main_loop_begin(); 223 ecore_main_loop_begin();
224 224
225 // Cleanup 225 // Cleanup
@@ -256,7 +256,7 @@ EFL_START_TEST(efl_io_manager_test_ls)
256 256
257 f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL); 257 f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL);
258 test_count = 6; 258 test_count = 6;
259 eina_future_then(f, _future_cb, &main_files); 259 eina_future_then(f, _future_cb, &main_files, NULL);
260 260
261 ecore_main_loop_begin(); 261 ecore_main_loop_begin();
262 262
@@ -299,7 +299,7 @@ EFL_START_TEST(efl_io_manager_test_open)
299 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get()); 299 job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
300 300
301 f = efl_io_manager_open(job, nested_filename, EINA_FALSE); 301 f = efl_io_manager_open(job, nested_filename, EINA_FALSE);
302 eina_future_then(f, _open_done_cb, &opened_file); 302 eina_future_then(f, _open_done_cb, &opened_file, NULL);
303 ecore_main_loop_begin(); 303 ecore_main_loop_begin();
304 304
305 fail_if(!opened_file); 305 fail_if(!opened_file);
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 2d88548239..e0aae0d938 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -149,7 +149,7 @@ EFL_START_TEST(eio_test_job_xattr_set)
149 fail_if(num_of_attr != 0); // test asynchronous 149 fail_if(num_of_attr != 0); // test asynchronous
150 } 150 }
151 eina_future_then(eina_future_all_array(futures), 151 eina_future_then(eina_future_all_array(futures),
152 _future_all_cb, &num_of_attr); 152 _future_all_cb, &num_of_attr, NULL);
153 153
154 ecore_main_loop_begin(); 154 ecore_main_loop_begin();
155 155
@@ -166,14 +166,14 @@ EFL_START_TEST(eio_test_job_xattr_set)
166 } 166 }
167 167
168 eina_future_then(eina_future_all_array(futures), 168 eina_future_then(eina_future_all_array(futures),
169 _future_done_cb, &num_of_attr); 169 _future_done_cb, &num_of_attr, NULL);
170 170
171 ecore_main_loop_begin(); 171 ecore_main_loop_begin();
172 172
173 num_of_attr = 0; 173 num_of_attr = 0;
174 174
175 eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL), 175 eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL),
176 _future_done_cb, &num_of_attr); 176 _future_done_cb, &num_of_attr, NULL);
177 177
178 fail_if(num_of_attr != 0); 178 fail_if(num_of_attr != 0);
179 179
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index ee0bb519e5..5994851b2f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -89,7 +89,7 @@ Eina_Value *
89efl_model_future_then(Eina_Future *future) 89efl_model_future_then(Eina_Future *future)
90{ 90{
91 Eina_Value *data = NULL; 91 Eina_Value *data = NULL;
92 eina_future_then(future, &_future_then_quit_cb, &data); 92 eina_future_then(future, &_future_then_quit_cb, &data, NULL);
93 ecore_main_loop_begin(); 93 ecore_main_loop_begin();
94 return data; 94 return data;
95} 95}
@@ -97,7 +97,7 @@ efl_model_future_then(Eina_Future *future)
97void 97void
98check_efl_model_future_error(Eina_Future *future, Eina_Error *err) 98check_efl_model_future_error(Eina_Future *future, Eina_Error *err)
99{ 99{
100 eina_future_then(future, &_future_check_err, err); 100 eina_future_then(future, &_future_check_err, err, NULL);
101 ecore_main_loop_begin(); 101 ecore_main_loop_begin();
102} 102}
103 103
@@ -105,7 +105,7 @@ int
105efl_model_future_then_u(Eina_Future *future) 105efl_model_future_then_u(Eina_Future *future)
106{ 106{
107 unsigned i = -1; 107 unsigned i = -1;
108 eina_future_then(future, &_future_then_quit_u_cb, &i); 108 eina_future_then(future, &_future_then_quit_u_cb, &i, NULL);
109 ecore_main_loop_begin(); 109 ecore_main_loop_begin();
110 return i; 110 return i;
111} 111}
@@ -293,7 +293,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
293{ 293{
294 Eina_Future *f; 294 Eina_Future *f;
295 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS)); 295 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
296 eina_future_then(f, _leave, NULL); 296 eina_future_then(f, _leave, NULL, NULL);
297} 297}
298 298
299static Eina_Future * 299static Eina_Future *
@@ -444,7 +444,7 @@ check_efl_model_property_int_set(Efl_Model *efl_model, const char *property, int
444 eina_value_set(&eina_value, value); 444 eina_value_set(&eina_value, value);
445 future = efl_model_property_set(efl_model, property, &eina_value); 445 future = efl_model_property_set(efl_model, property, &eina_value);
446 446
447 eina_future_then(future, &_future_then_cp, &value_ret); 447 eina_future_then(future, &_future_then_cp, &value_ret, NULL);
448 ecore_main_loop_begin(); 448 ecore_main_loop_begin();
449 449
450 property_type = eina_value_type_get(&value_ret); 450 property_type = eina_value_type_get(&value_ret);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
index 631faf1123..aa3e710516 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
@@ -85,13 +85,13 @@ EFL_START_TEST(property_set)
85 eina_value_setup(&value, EINA_VALUE_TYPE_INT); 85 eina_value_setup(&value, EINA_VALUE_TYPE_INT);
86 eina_value_set(&value, 1); 86 eina_value_set(&value, 1);
87 future = efl_model_property_set(connection, "nonexistent", &value); 87 future = efl_model_property_set(connection, "nonexistent", &value);
88 eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_NOT_FOUND)); 88 eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_NOT_FOUND), NULL);
89 89
90 ecore_main_loop_begin(); 90 ecore_main_loop_begin();
91 91
92 // UNIQUE_NAME_PROPERTY is read-only 92 // UNIQUE_NAME_PROPERTY is read-only
93 future = efl_model_property_set(connection, UNIQUE_NAME_PROPERTY, &value); 93 future = efl_model_property_set(connection, UNIQUE_NAME_PROPERTY, &value);
94 eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_READ_ONLY)); 94 eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_READ_ONLY), NULL);
95 95
96 ecore_main_loop_begin(); 96 ecore_main_loop_begin();
97 97
@@ -111,7 +111,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
111{ 111{
112 Eina_Future *f; 112 Eina_Future *f;
113 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS)); 113 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
114 eina_future_then(f, _leave, NULL); 114 eina_future_then(f, _leave, NULL, NULL);
115} 115}
116 116
117static void 117static void
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index a04b6ca08c..f252fbca7d 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -117,7 +117,7 @@ EFL_START_TEST(property_set)
117 Eina_Value dummy = EINA_VALUE_EMPTY; 117 Eina_Value dummy = EINA_VALUE_EMPTY;
118 118
119 future = efl_model_property_set(method, ARGUMENT_RESULT, &dummy); 119 future = efl_model_property_set(method, ARGUMENT_RESULT, &dummy);
120 eina_future_then(future, _expected_error, NULL); 120 eina_future_then(future, _expected_error, NULL, NULL);
121} 121}
122EFL_END_TEST 122EFL_END_TEST
123 123
@@ -138,7 +138,7 @@ EFL_START_TEST(children_slice_get)
138 Eina_Future *future; 138 Eina_Future *future;
139 139
140 future = efl_model_children_slice_get(method, 1, 1); 140 future = efl_model_children_slice_get(method, 1, 1);
141 eina_future_then(future, _expected_error, &EFL_MODEL_ERROR_NOT_SUPPORTED); 141 eina_future_then(future, _expected_error, &EFL_MODEL_ERROR_NOT_SUPPORTED, NULL);
142 142
143 ecore_main_loop_begin(); 143 ecore_main_loop_begin();
144} 144}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
index c0a9d7cef9..7959a2eb66 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
@@ -84,13 +84,13 @@ EFL_START_TEST(property_set)
84 eina_value_set(&value, 1); 84 eina_value_set(&value, 1);
85 85
86 future = efl_model_property_set(object, "nonexistent", &value); 86 future = efl_model_property_set(object, "nonexistent", &value);
87 eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_NOT_FOUND); 87 eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_NOT_FOUND, NULL);
88 88
89 ecore_main_loop_begin(); 89 ecore_main_loop_begin();
90 90
91 // UNIQUE_NAME_PROPERTY is read-only 91 // UNIQUE_NAME_PROPERTY is read-only
92 future = efl_model_property_set(object, UNIQUE_NAME_PROPERTY, &value); 92 future = efl_model_property_set(object, UNIQUE_NAME_PROPERTY, &value);
93 eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_READ_ONLY); 93 eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_READ_ONLY, NULL);
94 94
95 ecore_main_loop_begin(); 95 ecore_main_loop_begin();
96 96
@@ -120,7 +120,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
120 Eina_Future *f; 120 Eina_Future *f;
121 121
122 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS)); 122 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
123 eina_future_then(f, _leave, NULL); 123 eina_future_then(f, _leave, NULL, NULL);
124} 124}
125 125
126EFL_START_TEST(children_count) 126EFL_START_TEST(children_count)
@@ -186,7 +186,7 @@ EFL_START_TEST(child_del)
186 fail_if(expected_children_count == 0); 186 fail_if(expected_children_count == 0);
187 187
188 future = efl_model_children_slice_get(object, 0, 1); 188 future = efl_model_children_slice_get(object, 0, 1);
189 eina_future_then(future, _one_child, &child); 189 eina_future_then(future, _one_child, &child, NULL);
190 190
191 ecore_main_loop_begin(); 191 ecore_main_loop_begin();
192 192
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
index 4e2b8ecc0d..d9665142a2 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
@@ -29,7 +29,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
29 Eina_Future *f; 29 Eina_Future *f;
30 30
31 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS)); 31 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
32 eina_future_then(f, _leave, NULL); 32 eina_future_then(f, _leave, NULL, NULL);
33} 33}
34 34
35static void 35static void
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index 0cf6adc785..81d35df609 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -80,7 +80,7 @@ _property_ready(void *data EINA_UNUSED, const Efl_Event *ev)
80{ 80{
81 if (f) return ; 81 if (f) return ;
82 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS)); 82 f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
83 eina_future_then(f, _leave, NULL); 83 eina_future_then(f, _leave, NULL, NULL);
84} 84}
85 85
86EFL_START_TEST(property_get) 86EFL_START_TEST(property_get)
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index a5949f9f10..c431be3848 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -103,7 +103,7 @@ EFL_START_TEST(elm_layout_model_connect)
103 ck_assert(!!eina_value_setup(&v, EINA_VALUE_TYPE_STRING)); 103 ck_assert(!!eina_value_setup(&v, EINA_VALUE_TYPE_STRING));
104 ck_assert(!!eina_value_set(&v, text_value)); 104 ck_assert(!!eina_value_set(&v, text_value));
105 f = efl_model_property_set(model, "text_property", &v); 105 f = efl_model_property_set(model, "text_property", &v);
106 eina_future_then(f, _propagated_cb, NULL); 106 eina_future_then(f, _propagated_cb, NULL, NULL);
107 107
108 efl_ui_model_connect(ly, "text", "text_property"); 108 efl_ui_model_connect(ly, "text", "text_property");
109 efl_ui_view_model_set(ly, model); 109 efl_ui_view_model_set(ly, model);