xxx - fix eina_future_then calls to pass sotrage val - fix warns

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)
 
    if (td->f) eina_future_cancel(td->f);
    td->f = efl_loop_timeout(efl_provider_find(ev->object, EFL_LOOP_CLASS), 0.5);
-   eina_future_then(td->f, _ecore_timeout_cb, td);
+   eina_future_then(td->f, _ecore_timeout_cb, td, NULL);
 }
 
 static 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)
    Eina_Future *f;
 
    f = eina_future_then(efl_loop_job(efl_loop_get(data)),
-                        _code_changed, data);
+                        _code_changed, data, NULL);
    efl_future_Eina_FutureXXX_then(data, f);
 }
 
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)
      }
 
    job = eina_future_then(efl_loop_job(efl_main_loop_get()),
-                          _efl_loop_arguments_send, arga);
+                          _efl_loop_arguments_send, arga, NULL);
    efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job);
 }
 
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,
    req->parent = efl_ref(obj);
    req->start = start;
 
-   return efl_future_Eina_FutureXXX_then(obj,
-                                         eina_future_then(f, _efl_model_composite_boolean_then, req));
+   return efl_future_Eina_FutureXXX_then
+     (obj, eina_future_then(f, _efl_model_composite_boolean_then, req, NULL));
 }
 
 #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)
    else
      {
         r = efl_model_property_set(child, "selected", eina_value_bool_new(!!value));
-        r = eina_future_then(r, _commit_change, child);
-        r = eina_future_then(r, _clear_child, child);
+        r = eina_future_then(r, _commit_change, child, NULL);
+        r = eina_future_then(r, _clear_child, child, NULL);
      }
 
    return r;
@@ -218,9 +218,9 @@ _efl_model_composite_selection_efl_model_property_set(Eo *obj,
         if (!success)
           return eina_future_rejected(efl_loop_future_scheduler_get(obj), EFL_MODEL_ERROR_INCORRECT_VALUE);
 
-        return efl_future_Eina_FutureXXX_then(obj,
-                                              eina_future_then(efl_model_children_slice_get(obj, l, 1),
-                                                               _select_slice_then, obj));
+        return efl_future_Eina_FutureXXX_then
+          (obj, eina_future_then(efl_model_children_slice_get(obj, l, 1),
+                                 _select_slice_then, obj, NULL));
      }
 
    return efl_model_property_set(efl_super(obj, EFL_MODEL_COMPOSITE_SELECTION_CLASS), property, value);
@@ -281,7 +281,7 @@ _untangle_array(void *data,
                                    "selected", eina_value_bool_new(EINA_FALSE));
         // Once this is done, we need to repropagate the error
         eina_value_error_get(&v, error);
-        f = eina_future_then(f, _regenerate_error, error);
+        f = eina_future_then(f, _regenerate_error, error, NULL);
 
         return eina_future_as_value(f);
      }
@@ -380,14 +380,14 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj,
              // There was, need to unselect the previous one along setting the new value
              chain = eina_future_all(chain,
                                      eina_future_then(efl_model_children_slice_get(efl_parent_get(obj), selected, 1),
-                                                      _unselect_slice_then, NULL));
+                                                      _unselect_slice_then, NULL, NULL));
 
-             chain = eina_future_then(chain, _untangle_array, obj);
+             chain = eina_future_then(chain, _untangle_array, obj, NULL);
           }
      }
 
  commit_change:
-   chain = eina_future_then(chain, _commit_change, obj);
+   chain = eina_future_then(chain, _commit_change, obj, NULL);
 
    return efl_future_Eina_FutureXXX_then(obj, chain);
 }
@@ -448,7 +448,7 @@ _efl_model_composite_selection_efl_model_children_slice_get(Eo *obj,
    // NOTE: We do jump on purpose EFL_MODEL_COMPOSITE_BOOLEAN_CLASS here
    f = efl_model_children_slice_get(efl_super(obj, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS),
                                     start, count);
-   f = eina_future_then(f, _slice_get, req);
+   f = eina_future_then(f, _slice_get, req, NULL);
 
    return efl_future_Eina_FutureXXX_then(obj, f);
 }
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)
    EINA_FUTURE_CHECK_RETURN_VAL(f, v);
    p = eina_promise_new(_scheduler_get(f), _dummy_cancel, NULL);
    EINA_SAFETY_ON_NULL_GOTO(p, err_promise);
-   r_future = eina_future_then(f, _future_proxy, p);
+   r_future = eina_future_then(f, _future_proxy, p, NULL);
    //If eina_future_then() fails f will be cancelled
    EINA_SAFETY_ON_NULL_GOTO(r_future, err_future);
 
@@ -1305,7 +1305,7 @@ promise_proxy_of_future_array_create(Eina_Future *array[],
 
    for (i = 0; i < ctx->futures_len; i++)
      {
-        ctx->futures[i] = eina_future_then(array[i], future_cb, ctx);
+        ctx->futures[i] = eina_future_then(array[i], future_cb, ctx, NULL);
         //Futures will be cancelled by the caller...
         EINA_SAFETY_ON_NULL_GOTO(ctx->futures[i], err_then);
      }
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
    if (delayed_queue || ecore_time_get() - ecore_loop_time_get() > 0.004)
      {
         Eina_Future *f = eina_future_then(_build_delay(pd->loop),
-                                          _eio_build_mime_now, model);
+                                          _eio_build_mime_now, model, NULL);
         return eina_future_as_value(efl_future_Eina_FutureXXX_then(model, f));
      }
 
@@ -484,7 +484,7 @@ _eio_build_mime(const Efl_Object *model, Eio_Model_Data *pd)
    efl_wref_add(efl_provider_find(model, EFL_LOOP_CLASS), &pd->loop);
 
    f = efl_loop_job(pd->loop);
-   f = eina_future_then(f, _eio_build_mime_now, model);
+   f = eina_future_then(f, _eio_build_mime_now, model, NULL);
    pd->request.mime = efl_future_Eina_FutureXXX_then(model, f);
 }
 
@@ -808,7 +808,7 @@ _eio_model_efl_model_children_count_get(const Eo *obj, Eio_Model_Data *pd)
 
         f = efl_io_manager_direct_ls(iom, pd->path, EINA_FALSE,
                                      (void*) obj, _eio_model_children_list, NULL);
-        f = eina_future_then(f, _eio_model_children_list_on, pd);
+        f = eina_future_then(f, _eio_model_children_list_on, pd, NULL);
         pd->request.listing = efl_future_Eina_FutureXXX_then(obj, f);
      }
 
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
    if (efl_model_children_count_get(pd->model))
      {
         Eina_Future *f = efl_model_children_slice_get(pd->model, first, count);
-        f = eina_future_then(f, _children_slice_then, pd);
+        f = eina_future_then(f, _children_slice_then, pd, NULL);
         pd->slice.future = efl_future_Eina_FutureXXX_then(obj, f);
      }
 }
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)
    r->pd = pd;
 
    f = efl_model_children_slice_get(pd->model, evt->index, 1);
-   f = eina_future_then(f, _children_get, r);
+   f = eina_future_then(f, _children_get, r, NULL);
 }
 
 static 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)
         Eina_Future *f;
 
         f = eina_future_then(efl_loop_job(efl_loop_get(sd->obj)),
-                             _scroll_wheel_post_event_job, sd);
+                             _scroll_wheel_post_event_job, sd, NULL);
         efl_future_Eina_FutureXXX_then(sd->obj, f);
      }
    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,
    if (efl_model_children_count_get(model))
      {
         future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
-        future = eina_future_then(future, _process_children_cb, lreq);
+        future = eina_future_then(future, _process_children_cb, lreq, NULL);
         efl_future_Eina_FutureXXX_then(obj, future);
      }
    else
@@ -1498,7 +1498,7 @@ _on_text_activated(void *data, const Efl_Event *event)
    efl_key_data_set(fs, _text_activated_path_key, eina_stringshare_add(path));
    efl_key_ref_set(fs, _text_activated_model_key, model);
    efl_ref(fs);
-   eina_future_then(future, _on_text_activated_set_path_then, fs);
+   eina_future_then(future, _on_text_activated_set_path_then, fs, NULL);
 
    elm_object_focus_set(event->object, EINA_FALSE);
 }
@@ -1687,7 +1687,7 @@ _resource_created(void *data, const Efl_Event *event)
      return;
 
    f = efl_model_children_slice_get(sd->model, evt->index, 1);
-   f = eina_future_then(f, _resource_created_then, fs);
+   f = eina_future_then(f, _resource_created_then, fs, NULL);
    efl_future_Eina_FutureXXX_then(fs, f);
 }
 
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
         Eina_Future *f;
 
         f = eina_future_then(efl_loop_job(efl_loop_get(sid->obj)),
-                             _scroll_wheel_post_event_job, sid);
+                             _scroll_wheel_post_event_job, sid, NULL);
         efl_future_Eina_FutureXXX_then(sid->obj, f);
      }
    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)
 
    f = efl_model_children_slice_get(pdata->priv->connect.model, 0,
                                     efl_model_children_count_get(pdata->priv->connect.model));
-   f = eina_future_then(f, _efl_model_load_children_then, pdata);
+   f = eina_future_then(f, _efl_model_load_children_then, pdata, NULL);
    efl_future_Eina_FutureXXX_then(pdata->priv->genlist, f);
 }
 
@@ -317,7 +317,7 @@ _efl_model_children_added_cb(void *data, const Efl_Event *event)
    Eina_Future *f;
 
    f = efl_model_children_slice_get(idata->priv->connect.model, evt->index, 1);
-   f = eina_future_then(f, _efl_model_load_children_then, idata);
+   f = eina_future_then(f, _efl_model_load_children_then, idata, NULL);
    efl_future_Eina_FutureXXX_then(idata->priv->genlist, f);
 }
 
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,
     { \
        Eina_Bool _did_timeout = EINA_FALSE; \
        Eina_Future *_timeout_future = efl_loop_timeout(efl_main_loop_get(), t); \
-       eina_future_then(_timeout_future, _timeout, &_did_timeout); \
+       eina_future_then(_timeout_future, _timeout, &_did_timeout, NULL); \
        mark_point(); \
        ecore_main_loop_begin(); \
        if (!_did_timeout) eina_future_cancel(_timeout_future); \
@@ -239,7 +239,7 @@ _resolve(struct resolve_ctx *ctx, const char *address, int family, int flags)
    ctx->future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS,
                                             address, family, flags);
    ck_assert_ptr_ne(ctx->future, NULL);
-   ctx->future = eina_future_then(ctx->future, _resolve_done, ctx);
+   ctx->future = eina_future_then(ctx->future, _resolve_done, ctx, NULL);
 
    LOOP_WITH_TIMEOUT(10);
 }
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)
    ck_assert(!!model);
 
    future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
-   eina_future_then(future, _children_slice_get_then, NULL);
+   eina_future_then(future, _children_slice_get_then, NULL, NULL);
 
    ecore_main_loop_begin();
 }
@@ -166,11 +166,11 @@ EFL_START_TEST(efl_test_model_composite_selection)
                    efl_ui_view_model_set(efl_added, base_model));
    ck_assert(!!model);
    future = efl_model_property_set(model, "selected", eina_value_int_new(2));
-   eina_future_then(future, _wait_propagate, NULL);
+   eina_future_then(future, _wait_propagate, NULL, NULL);
    ecore_main_loop_begin();
 
    future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
-   eina_future_then(future, _selection_children_slice_get_then, NULL);
+   eina_future_then(future, _selection_children_slice_get_then, NULL, NULL);
 
    ecore_main_loop_begin();
 }
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)
 
    future = efl_model_children_slice_get(model, 0, efl_model_children_count_get(model));
 
-   eina_future_then(future, _children_slice_future_then, NULL);
+   eina_future_then(future, _children_slice_future_then, NULL, NULL);
 
    ecore_main_loop_begin();
 }
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,
    if (efl_model_children_count_get(filemodel) == 0)
      {
         future = efl_loop_job(efl_provider_find(filemodel, EFL_LOOP_CLASS));
-        future = eina_future_then(future, listing, filemodel);
+        future = eina_future_then(future, listing, filemodel, NULL);
      }
    else
      {
         future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
-        future = eina_future_then(future, &promise_then_accessor, NULL);
+        future = eina_future_then(future, &promise_then_accessor, NULL, NULL);
      }
 
    return eina_future_as_value(future);
@@ -122,8 +122,8 @@ setup_waiter(Efl_Model *model)
 
    if (listingf) return ;
    listingf = efl_loop_job(loop);
-   listingf = eina_future_then(listingf, listing, model);
-   listingf = eina_future_then(listingf, clearup, NULL);
+   listingf = eina_future_then(listingf, listing, model, NULL);
+   listingf = eina_future_then(listingf, clearup, NULL, NULL);
 }
 
 static 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)
    Eina_Future *future;
 
    future = efl_model_children_slice_get(event->object, evt->index, 1);
-   eina_future_then(future, _children_get, event->object);
+   eina_future_then(future, _children_get, event->object, NULL);
 }
 
 static Eina_Value
@@ -111,7 +111,7 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
 
    future = efl_model_children_slice_get(filemodel, 0, efl_model_children_count_get(filemodel));
 
-   eina_future_then(future, &_create_file, NULL);
+   eina_future_then(future, &_create_file, NULL, NULL);
 
    ecore_main_loop_begin();
 
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
    f = func(job, test_dirname, EINA_FALSE, &main_files, _progress_cb, NULL);
    fail_if(!f);
    test_count = expected_test_count;
-   eina_future_then(f, &_done_cb, &main_files);
+   eina_future_then(f, &_done_cb, &main_files, NULL);
 
    ecore_main_loop_begin();
 
@@ -183,7 +183,7 @@ _test_ls(Eina_Future *(*func)(const Eo *obj, const char *path, Eina_Bool recursi
 
    f = func(job, test_dirname, EINA_TRUE, &main_files, _progress_cb, NULL);
    test_count = expected_test_count + 4;
-   eina_future_then(f, &_done_cb, &main_files);
+   eina_future_then(f, &_done_cb, &main_files, NULL);
 
    ecore_main_loop_begin();
 
@@ -214,12 +214,12 @@ EFL_START_TEST(efl_io_manager_test_stat)
 
    // Start testing
    f = efl_io_manager_stat(job, nested_dirname);
-   eina_future_then(f, _stat_done_cb, &is_dir);
+   eina_future_then(f, _stat_done_cb, &is_dir, NULL);
    ecore_main_loop_begin();
 
    is_dir = EINA_FALSE;
    f = efl_io_manager_stat(job, nested_filename);
-   eina_future_then(f, _stat_done_cb, &is_dir);
+   eina_future_then(f, _stat_done_cb, &is_dir, NULL);
    ecore_main_loop_begin();
 
    // Cleanup
@@ -256,7 +256,7 @@ EFL_START_TEST(efl_io_manager_test_ls)
 
    f = efl_io_manager_ls(job, test_dirname, &main_files, _access_cb, NULL);
    test_count = 6;
-   eina_future_then(f, _future_cb, &main_files);
+   eina_future_then(f, _future_cb, &main_files, NULL);
 
    ecore_main_loop_begin();
 
@@ -299,7 +299,7 @@ EFL_START_TEST(efl_io_manager_test_open)
    job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
 
    f = efl_io_manager_open(job, nested_filename, EINA_FALSE);
-   eina_future_then(f, _open_done_cb, &opened_file);
+   eina_future_then(f, _open_done_cb, &opened_file, NULL);
    ecore_main_loop_begin();
 
    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)
         fail_if(num_of_attr != 0); // test asynchronous
      }
    eina_future_then(eina_future_all_array(futures),
-                    _future_all_cb, &num_of_attr);
+                    _future_all_cb, &num_of_attr, NULL);
 
    ecore_main_loop_begin();
 
@@ -166,14 +166,14 @@ EFL_START_TEST(eio_test_job_xattr_set)
      }
 
    eina_future_then(eina_future_all_array(futures),
-                   _future_done_cb, &num_of_attr);
+                   _future_done_cb, &num_of_attr, NULL);
 
    ecore_main_loop_begin();
 
    num_of_attr = 0;
 
    eina_future_then(efl_io_manager_xattr_ls(job, test_file_path, &num_of_attr, _main_cb, NULL),
-                    _future_done_cb, &num_of_attr);
+                    _future_done_cb, &num_of_attr, NULL);
 
    fail_if(num_of_attr != 0);
 
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 *
 efl_model_future_then(Eina_Future *future)
 {
    Eina_Value *data = NULL;
-   eina_future_then(future, &_future_then_quit_cb, &data);
+   eina_future_then(future, &_future_then_quit_cb, &data, NULL);
    ecore_main_loop_begin();
    return data;
 }
@@ -97,7 +97,7 @@ efl_model_future_then(Eina_Future *future)
 void
 check_efl_model_future_error(Eina_Future *future, Eina_Error *err)
 {
-   eina_future_then(future, &_future_check_err, err);
+   eina_future_then(future, &_future_check_err, err, NULL);
    ecore_main_loop_begin();
 }
 
@@ -105,7 +105,7 @@ int
 efl_model_future_then_u(Eina_Future *future)
 {
    unsigned i = -1;
-   eina_future_then(future, &_future_then_quit_u_cb, &i);
+   eina_future_then(future, &_future_then_quit_u_cb, &i, NULL);
    ecore_main_loop_begin();
    return i;
 }
@@ -293,7 +293,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
 {
    Eina_Future *f;
    f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
-   eina_future_then(f, _leave, NULL);
+   eina_future_then(f, _leave, NULL, NULL);
 }
 
 static Eina_Future *
@@ -444,7 +444,7 @@ check_efl_model_property_int_set(Efl_Model *efl_model, const char *property, int
    eina_value_set(&eina_value, value);
    future = efl_model_property_set(efl_model, property, &eina_value);
 
-   eina_future_then(future, &_future_then_cp, &value_ret);
+   eina_future_then(future, &_future_then_cp, &value_ret, NULL);
    ecore_main_loop_begin();
 
    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)
    eina_value_setup(&value, EINA_VALUE_TYPE_INT);
    eina_value_set(&value, 1);
    future = efl_model_property_set(connection, "nonexistent", &value);
-   eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_NOT_FOUND));
+   eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_NOT_FOUND), NULL);
 
    ecore_main_loop_begin();
 
    // UNIQUE_NAME_PROPERTY is read-only
    future = efl_model_property_set(connection, UNIQUE_NAME_PROPERTY, &value);
-   eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_READ_ONLY));
+   eina_future_then(future, _failed_property_set, eina_value_error_new(EFL_MODEL_ERROR_READ_ONLY), NULL);
 
    ecore_main_loop_begin();
 
@@ -111,7 +111,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
 {
    Eina_Future *f;
    f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
-   eina_future_then(f, _leave, NULL);
+   eina_future_then(f, _leave, NULL, NULL);
 }
 
 static 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)
    Eina_Value dummy = EINA_VALUE_EMPTY;
 
    future = efl_model_property_set(method, ARGUMENT_RESULT, &dummy);
-   eina_future_then(future, _expected_error, NULL);
+   eina_future_then(future, _expected_error, NULL, NULL);
 }
 EFL_END_TEST
 
@@ -138,7 +138,7 @@ EFL_START_TEST(children_slice_get)
    Eina_Future *future;
 
    future = efl_model_children_slice_get(method, 1, 1);
-   eina_future_then(future, _expected_error, &EFL_MODEL_ERROR_NOT_SUPPORTED);
+   eina_future_then(future, _expected_error, &EFL_MODEL_ERROR_NOT_SUPPORTED, NULL);
 
    ecore_main_loop_begin();
 }
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)
    eina_value_set(&value, 1);
 
    future = efl_model_property_set(object, "nonexistent", &value);
-   eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_NOT_FOUND);
+   eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_NOT_FOUND, NULL);
 
    ecore_main_loop_begin();
 
    // UNIQUE_NAME_PROPERTY is read-only
    future = efl_model_property_set(object, UNIQUE_NAME_PROPERTY, &value);
-   eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_READ_ONLY);
+   eina_future_then(future, _expect_error, &EFL_MODEL_ERROR_READ_ONLY, NULL);
 
    ecore_main_loop_begin();
 
@@ -120,7 +120,7 @@ _count_changed(void *data EINA_UNUSED, const Efl_Event *ev)
    Eina_Future *f;
 
    f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
-   eina_future_then(f, _leave, NULL);
+   eina_future_then(f, _leave, NULL, NULL);
 }
 
 EFL_START_TEST(children_count)
@@ -186,7 +186,7 @@ EFL_START_TEST(child_del)
    fail_if(expected_children_count == 0);
 
    future = efl_model_children_slice_get(object, 0, 1);
-   eina_future_then(future, _one_child, &child);
+   eina_future_then(future, _one_child, &child, NULL);
 
    ecore_main_loop_begin();
 
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)
    Eina_Future *f;
 
    f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
-   eina_future_then(f, _leave, NULL);
+   eina_future_then(f, _leave, NULL, NULL);
 }
 
 static 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)
 {
    if (f) return ;
    f = efl_loop_job(efl_provider_find(ev->object, EFL_LOOP_CLASS));
-   eina_future_then(f, _leave, NULL);
+   eina_future_then(f, _leave, NULL, NULL);
 }
 
 EFL_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)
    ck_assert(!!eina_value_setup(&v, EINA_VALUE_TYPE_STRING));
    ck_assert(!!eina_value_set(&v, text_value));
    f = efl_model_property_set(model, "text_property", &v);
-   eina_future_then(f, _propagated_cb, NULL);
+   eina_future_then(f, _propagated_cb, NULL, NULL);
 
    efl_ui_model_connect(ly, "text", "text_property");
    efl_ui_view_model_set(ly, model);