summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
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/ecore_con
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/ecore_con')
-rw-r--r--src/lib/ecore_con/efl_net_control_access_point-connman.c4
-rw-r--r--src/lib/ecore_con/efl_net_control_technology-connman.c6
-rw-r--r--src/lib/ecore_con/efl_net_ip_address.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ecore_con/efl_net_control_access_point-connman.c b/src/lib/ecore_con/efl_net_control_access_point-connman.c
index 32394ab..a54cce2 100644
--- a/src/lib/ecore_con/efl_net_control_access_point-connman.c
+++ b/src/lib/ecore_con/efl_net_control_access_point-connman.c
@@ -751,7 +751,7 @@ _efl_net_control_access_point_connect_cb(void *data, const Eldbus_Message *msg,
751} 751}
752 752
753static void 753static void
754_efl_net_control_access_point_connect_promise_del(void *data, Efl_Loop_Consumer *consumer EINA_UNUSED, const Eina_Promise *dead_ptr) 754_efl_net_control_access_point_connect_promise_del(void *data, const Eina_Promise *dead_ptr)
755{ 755{
756 Eldbus_Pending *p = data; 756 Eldbus_Pending *p = data;
757 Efl_Net_Control_Access_Point_Data *pd; 757 Efl_Net_Control_Access_Point_Data *pd;
@@ -773,7 +773,7 @@ _efl_net_control_access_point_connect(Eo *o, Efl_Net_Control_Access_Point_Data *
773 Eina_Promise *promise; 773 Eina_Promise *promise;
774 Eina_Future *f = NULL; 774 Eina_Future *f = NULL;
775 775
776 promise = efl_loop_promise_new(o, o, _efl_net_control_access_point_connect_promise_del, NULL); 776 promise = efl_loop_promise_new(o, _efl_net_control_access_point_connect_promise_del, o);
777 EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL); 777 EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL);
778 778
779 f = eina_future_new(promise); 779 f = eina_future_new(promise);
diff --git a/src/lib/ecore_con/efl_net_control_technology-connman.c b/src/lib/ecore_con/efl_net_control_technology-connman.c
index a006923..92660de 100644
--- a/src/lib/ecore_con/efl_net_control_technology-connman.c
+++ b/src/lib/ecore_con/efl_net_control_technology-connman.c
@@ -371,9 +371,9 @@ _efl_net_control_technology_scan_cb(void *data, const Eldbus_Message *msg, Eldbu
371} 371}
372 372
373static void 373static void
374_efl_net_control_technology_scan_promise_del(void *data, Efl_Loop_Consumer *consumer, const Eina_Promise *dead_ptr) 374_efl_net_control_technology_scan_promise_del(void *data, const Eina_Promise *dead_ptr)
375{ 375{
376 Eldbus_Pending *p = consumer; 376 Eldbus_Pending *p = data;
377 Efl_Net_Control_Technology_Data *pd; 377 Efl_Net_Control_Technology_Data *pd;
378 Eo *o; 378 Eo *o;
379 379
@@ -399,7 +399,7 @@ _efl_net_control_technology_scan(Eo *o, Efl_Net_Control_Technology_Data *pd)
399 Eina_Promise *promise; 399 Eina_Promise *promise;
400 Eina_Future *f = NULL; 400 Eina_Future *f = NULL;
401 401
402 promise = efl_loop_promise_new(o, NULL, _efl_net_control_technology_scan_promise_del, NULL); 402 promise = efl_loop_promise_new(o, _efl_net_control_technology_scan_promise_del, NULL);
403 EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL); 403 EINA_SAFETY_ON_NULL_RETURN_VAL(promise, NULL);
404 404
405 f = eina_future_new(promise); 405 f = eina_future_new(promise);
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c
index 46fe75b..b6d9317 100644
--- a/src/lib/ecore_con/efl_net_ip_address.c
+++ b/src/lib/ecore_con/efl_net_ip_address.c
@@ -573,7 +573,7 @@ _efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const cha
573 ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx); 573 ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx);
574 EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread); 574 EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread);
575 575
576 ctx->promise = eina_promise_new(efl_loop_future_scheduler_get(efl_main_loop_get()), _efl_net_ip_address_resolve_del, ctx); 576 ctx->promise = efl_loop_promise_new(efl_main_loop_get(), _efl_net_ip_address_resolve_del, ctx);
577 EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise); 577 EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise);
578 578
579 free(str); 579 free(str);