summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-12-19 16:35:24 -0800
committerCedric BAIL <cedric@osg.samsung.com>2018-12-20 12:42:34 -0800
commit9b5155c9f135f9ef450a817979f5884352b2d4c0 (patch)
tree69775932d4aebc2a7977e074f352bcfdae516c3f /src/lib/eldbus
parentce56f32270c2f75adab022b701d3bdcbbbc3fb44 (diff)
ecore: make efl_loop_promise_new a function of Efl.Loop_Consumer.
I am not sure this is the right way to do it as binding would have to likely to bind it manually. Reviewed-by: Lauro Neto <Lauro Moura <lauromoura@expertisesolutions.com.br>> Differential Revision: https://phab.enlightenment.org/D7492
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_object.c2
-rw-r--r--src/lib/eldbus/eldbus_model_private.h1
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c3
4 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 175afcd..a8f2d52 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -70,7 +70,7 @@ _eldbus_model_connection_efl_model_children_slice_get(Eo *obj,
70 return efl_loop_future_resolved(obj, v); 70 return efl_loop_future_resolved(obj, v);
71 } 71 }
72 72
73 p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL); 73 p = efl_loop_promise_new(obj, NULL, _eldbus_eina_promise_cancel, NULL);
74 74
75 slice = calloc(1, sizeof (Eldbus_Children_Slice_Promise)); 75 slice = calloc(1, sizeof (Eldbus_Children_Slice_Promise));
76 slice->p = p; 76 slice->p = p;
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index 3759fc3..b975514 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -127,7 +127,7 @@ _eldbus_model_object_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
127 return efl_loop_future_resolved(obj, v); 127 return efl_loop_future_resolved(obj, v);
128 } 128 }
129 129
130 p = efl_loop_promise_new(obj, _eldbus_eina_promise_cancel, NULL); 130 p = efl_loop_promise_new(obj, NULL, _eldbus_eina_promise_cancel, NULL);
131 131
132 slice = calloc(1, sizeof(struct _Eldbus_Children_Slice_Promise)); 132 slice = calloc(1, sizeof(struct _Eldbus_Children_Slice_Promise));
133 slice->p = p; 133 slice->p = p;
diff --git a/src/lib/eldbus/eldbus_model_private.h b/src/lib/eldbus/eldbus_model_private.h
index 3f66859..e58a25d 100644
--- a/src/lib/eldbus/eldbus_model_private.h
+++ b/src/lib/eldbus/eldbus_model_private.h
@@ -41,6 +41,7 @@ extern int eldbus_model_log_dom;
41 41
42static inline void 42static inline void
43_eldbus_eina_promise_cancel(void *data EINA_UNUSED, 43_eldbus_eina_promise_cancel(void *data EINA_UNUSED,
44 Efl_Loop_Consumer *consumer EINA_UNUSED,
44 const Eina_Promise *dead_ptr EINA_UNUSED) 45 const Eina_Promise *dead_ptr EINA_UNUSED)
45{ 46{
46} 47}
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 4da54ad..ca5cfc3 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -230,6 +230,7 @@ eldbus_model_proxy_property_check(Eldbus_Model_Proxy_Data *pd,
230 230
231static void 231static void
232_eldbus_model_proxy_cancel_cb(void *data, 232_eldbus_model_proxy_cancel_cb(void *data,
233 Efl_Loop_Consumer *consumer EINA_UNUSED,
233 const Eina_Promise *dead_promise EINA_UNUSED) 234 const Eina_Promise *dead_promise EINA_UNUSED)
234{ 235{
235 Eldbus_Model_Proxy_Property_Set_Data *sd = data; 236 Eldbus_Model_Proxy_Property_Set_Data *sd = data;
@@ -293,7 +294,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
293 if (!data) goto on_error; 294 if (!data) goto on_error;
294 295
295 data->pd = pd; 296 data->pd = pd;
296 data->promise = efl_loop_promise_new(obj, _eldbus_model_proxy_cancel_cb, data); 297 data->promise = efl_loop_promise_new(obj, data, _eldbus_model_proxy_cancel_cb, NULL);
297 data->property = eina_stringshare_add(property); 298 data->property = eina_stringshare_add(property);
298 if (!(data->value = eina_value_dup(value))) goto on_error; 299 if (!(data->value = eina_value_dup(value))) goto on_error;
299 300