summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
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/eldbus
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/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, 3 insertions, 5 deletions
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index a8f2d52..175afcd 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, NULL, _eldbus_eina_promise_cancel, NULL); 73 p = efl_loop_promise_new(obj, _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 b975514..3759fc3 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, NULL, _eldbus_eina_promise_cancel, NULL); 130 p = efl_loop_promise_new(obj, _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 e58a25d..3f66859 100644
--- a/src/lib/eldbus/eldbus_model_private.h
+++ b/src/lib/eldbus/eldbus_model_private.h
@@ -41,7 +41,6 @@ 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,
45 const Eina_Promise *dead_ptr EINA_UNUSED) 44 const Eina_Promise *dead_ptr EINA_UNUSED)
46{ 45{
47} 46}
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index ca5cfc3..4da54ad 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -230,7 +230,6 @@ 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,
234 const Eina_Promise *dead_promise EINA_UNUSED) 233 const Eina_Promise *dead_promise EINA_UNUSED)
235{ 234{
236 Eldbus_Model_Proxy_Property_Set_Data *sd = data; 235 Eldbus_Model_Proxy_Property_Set_Data *sd = data;
@@ -294,7 +293,7 @@ _eldbus_model_proxy_efl_model_property_set(Eo *obj EINA_UNUSED,
294 if (!data) goto on_error; 293 if (!data) goto on_error;
295 294
296 data->pd = pd; 295 data->pd = pd;
297 data->promise = efl_loop_promise_new(obj, data, _eldbus_model_proxy_cancel_cb, NULL); 296 data->promise = efl_loop_promise_new(obj, _eldbus_model_proxy_cancel_cb, data);
298 data->property = eina_stringshare_add(property); 297 data->property = eina_stringshare_add(property);
299 if (!(data->value = eina_value_dup(value))) goto on_error; 298 if (!(data->value = eina_value_dup(value))) goto on_error;
300 299