stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4df5e929fce038f2ea5928577caf28be2d7bcd8f
commit 4df5e929fce038f2ea5928577caf28be2d7bcd8f Author: Stefan Schmidt <[email protected]> Date: Fri Jun 17 12:29:19 2016 +0200 examples: eldbus and elementary: fix build after efl model changes In commit 8e4f383d61188020d5ceeee691fd7df761f10202 the function signature changed but examples have not been build and fixed. --- src/examples/eldbus/dbusmodel.c | 6 +++--- src/examples/elementary/filemvc.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c index 9695bd5..ea43bc4 100644 --- a/src/examples/eldbus/dbusmodel.c +++ b/src/examples/eldbus/dbusmodel.c @@ -80,7 +80,7 @@ promise_then_a(void* priv_obj EINA_UNUSED, void* data) unsigned j = 0; EINA_ARRAY_ITER_NEXT(properties_list, j, property, a_it) { - efl_model_property_get(child, property, &promises[j]); + promises[j] = efl_model_property_get(child, property); } eina_promise_then(eina_promise_all(eina_carray_iterator_new((void **)promises)), &promise_then_prop_c, &error_cb, child); @@ -137,8 +137,8 @@ main(int argc, char **argv EINA_UNUSED) root = eo_add_ref(ELDBUS_MODEL_OBJECT_CLASS, NULL, eldbus_model_object_constructor(eo_self, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, bus, path)); Eina_Promise *promises[] = { NULL, NULL, NULL}; - efl_model_children_slice_get(root, 0, 0, &promises[0]); - efl_model_children_count_get(root, &promises[1]); + promises[0] = efl_model_children_slice_get(root, 0, 0); + promises[1] = efl_model_children_count_get(root); eina_promise_then(eina_promise_all(eina_carray_iterator_new((void **)promises)), &promise_then, &error_cb, root); diff --git a/src/examples/elementary/filemvc.c b/src/examples/elementary/filemvc.c index eb33d55..f4d7890 100644 --- a/src/examples/elementary/filemvc.c +++ b/src/examples/elementary/filemvc.c @@ -84,7 +84,7 @@ _tree_selected_cb(void *data, const Eo_Event *event) printf("TREE selected model\n"); - efl_model_property_get(child, "path", &promise); + promise= efl_model_property_get(child, "path"); eina_promise_then(promise, &_promise_then, &_promise_error, priv); return EINA_TRUE; } --
