diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-01-02 15:41:46 +0900 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2018-01-02 16:13:54 +0900 |
commit | 9bedda14b3a3edb972bb231dd1e727c86355d6da (patch) | |
tree | 9b6c18ce786621dfcc94e7c8728a5b8dcbbc5a48 /src/lib | |
parent | 44b6aa16c1054b545583408c31c4243144852960 (diff) |
efl loop - rename ecore_main_loop_get to efl_main_loop_get
ecore_main_loop_get() is really a new "eo api" but it's using our old
ecore_* namespace, so move to the new efl namespace.
Diffstat (limited to 'src/lib')
30 files changed, 92 insertions, 92 deletions
diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index bc8174196e..77cc3d45e4 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h | |||
@@ -80,7 +80,7 @@ EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(Eo *obj); | |||
80 | #include "efl_interpolator_cubic_bezier.eo.h" | 80 | #include "efl_interpolator_cubic_bezier.eo.h" |
81 | 81 | ||
82 | /* We ue the factory pattern here, so you shouldn't call eo_add directly. */ | 82 | /* We ue the factory pattern here, so you shouldn't call eo_add directly. */ |
83 | EAPI Eo *ecore_main_loop_get(void); | 83 | EAPI Eo *efl_main_loop_get(void); |
84 | 84 | ||
85 | typedef struct _Efl_Future_Composite_Progress Efl_Future_All_Progress; | 85 | typedef struct _Efl_Future_Composite_Progress Efl_Future_All_Progress; |
86 | 86 | ||
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index deba63533f..586f3588a4 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c | |||
@@ -323,7 +323,7 @@ ecore_init(void) | |||
323 | sec = ((double) atoi(getenv("WATCHDOG_USEC"))) / 1000 / 1000; | 323 | sec = ((double) atoi(getenv("WATCHDOG_USEC"))) / 1000 / 1000; |
324 | 324 | ||
325 | _systemd_watchdog = | 325 | _systemd_watchdog = |
326 | efl_add(EFL_LOOP_TIMER_CLASS, ecore_main_loop_get(), | 326 | efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(), |
327 | efl_loop_timer_interval_set(efl_added, sec / 2), | 327 | efl_loop_timer_interval_set(efl_added, sec / 2), |
328 | efl_event_callback_add(efl_added, | 328 | efl_event_callback_add(efl_added, |
329 | EFL_LOOP_TIMER_EVENT_TICK, | 329 | EFL_LOOP_TIMER_EVENT_TICK, |
@@ -347,7 +347,7 @@ ecore_init(void) | |||
347 | ecore_system_modules_load(); | 347 | ecore_system_modules_load(); |
348 | 348 | ||
349 | if (getenv("EFL_FIRST_LOOP")) | 349 | if (getenv("EFL_FIRST_LOOP")) |
350 | efl_event_callback_add(ecore_main_loop_get(), | 350 | efl_event_callback_add(efl_main_loop_get(), |
351 | EFL_LOOP_EVENT_RESUME, | 351 | EFL_LOOP_EVENT_RESUME, |
352 | _efl_first_loop_iterate, | 352 | _efl_first_loop_iterate, |
353 | getenv("EFL_FIRST_LOOP")); | 353 | getenv("EFL_FIRST_LOOP")); |
@@ -391,7 +391,7 @@ ecore_shutdown(void) | |||
391 | if (_ecore_init_count-- != _ecore_init_count_threshold) | 391 | if (_ecore_init_count-- != _ecore_init_count_threshold) |
392 | goto end; | 392 | goto end; |
393 | 393 | ||
394 | efl_event_callback_call(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, NULL); | 394 | efl_event_callback_call(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, NULL); |
395 | 395 | ||
396 | ecore_system_modules_unload(); | 396 | ecore_system_modules_unload(); |
397 | 397 | ||
diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 00266b88f2..4c4c81772a 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c | |||
@@ -1058,7 +1058,7 @@ void | |||
1058 | _ecore_main_loop_init(void) | 1058 | _ecore_main_loop_init(void) |
1059 | { | 1059 | { |
1060 | DBG("_ecore_main_loop_init"); | 1060 | DBG("_ecore_main_loop_init"); |
1061 | if (!ecore_main_loop_get()) ERR("Cannot create main loop object"); | 1061 | if (!efl_main_loop_get()) ERR("Cannot create main loop object"); |
1062 | _ecore_main_loop_setup(ML_OBJ, ML_DAT); | 1062 | _ecore_main_loop_setup(ML_OBJ, ML_DAT); |
1063 | } | 1063 | } |
1064 | 1064 | ||
diff --git a/src/lib/ecore/ecore_thread.c b/src/lib/ecore/ecore_thread.c index 2c887e5de2..abef08f4ad 100644 --- a/src/lib/ecore/ecore_thread.c +++ b/src/lib/ecore/ecore_thread.c | |||
@@ -1635,7 +1635,7 @@ ecore_thread_future_run(Ecore_Thread_Future_Cb heavy, const void *data, Eina_Fre | |||
1635 | 1635 | ||
1636 | efl_domain_current_push(EFL_ID_DOMAIN_SHARED); | 1636 | efl_domain_current_push(EFL_ID_DOMAIN_SHARED); |
1637 | 1637 | ||
1638 | efl_wref_add(efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()), &p); | 1638 | efl_wref_add(efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()), &p); |
1639 | if (!p) goto end; | 1639 | if (!p) goto end; |
1640 | 1640 | ||
1641 | efl_object_override(p, &thread_safe_call); | 1641 | efl_object_override(p, &thread_safe_call); |
diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 712bd17a85..c473b3e50d 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c | |||
@@ -179,7 +179,7 @@ ecore_timer_add(double in, Ecore_Task_Cb func, const void *data) | |||
179 | 179 | ||
180 | legacy->func = func; | 180 | legacy->func = func; |
181 | legacy->data = data; | 181 | legacy->data = data; |
182 | timer = efl_add(MY_CLASS, ecore_main_loop_get(), | 182 | timer = efl_add(MY_CLASS, efl_main_loop_get(), |
183 | efl_event_callback_array_add(efl_added, legacy_timer(), legacy), | 183 | efl_event_callback_array_add(efl_added, legacy_timer(), legacy), |
184 | efl_key_data_set(efl_added, "_legacy", legacy), | 184 | efl_key_data_set(efl_added, "_legacy", legacy), |
185 | efl_loop_timer_interval_set(efl_added, in)); | 185 | efl_loop_timer_interval_set(efl_added, in)); |
@@ -198,7 +198,7 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data) | |||
198 | 198 | ||
199 | legacy->func = func; | 199 | legacy->func = func; |
200 | legacy->data = data; | 200 | legacy->data = data; |
201 | timer = efl_add(MY_CLASS, ecore_main_loop_get(), | 201 | timer = efl_add(MY_CLASS, efl_main_loop_get(), |
202 | efl_event_callback_array_add(efl_added, legacy_timer(), legacy), | 202 | efl_event_callback_array_add(efl_added, legacy_timer(), legacy), |
203 | efl_key_data_set(efl_added, "_legacy", legacy), | 203 | efl_key_data_set(efl_added, "_legacy", legacy), |
204 | efl_loop_timer_loop_reset(efl_added), | 204 | efl_loop_timer_loop_reset(efl_added), |
diff --git a/src/lib/ecore/efl_general.h b/src/lib/ecore/efl_general.h index e115c08bfc..256f1065a4 100644 --- a/src/lib/ecore/efl_general.h +++ b/src/lib/ecore/efl_general.h | |||
@@ -93,10 +93,10 @@ | |||
93 | _efl_startup_time = ecore_time_unix_get(); \ | 93 | _efl_startup_time = ecore_time_unix_get(); \ |
94 | _EFL_APP_VERSION_SET(); \ | 94 | _EFL_APP_VERSION_SET(); \ |
95 | ecore_init(); \ | 95 | ecore_init(); \ |
96 | efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \ | 96 | efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, efl_main, NULL); \ |
97 | ecore_init_ex(argc, argv); \ | 97 | ecore_init_ex(argc, argv); \ |
98 | __EFL_MAIN_CONSTRUCTOR; \ | 98 | __EFL_MAIN_CONSTRUCTOR; \ |
99 | ret__ = efl_loop_begin(ecore_main_loop_get()); \ | 99 | ret__ = efl_loop_begin(efl_main_loop_get()); \ |
100 | real__ = efl_loop_exit_code_process(ret__); \ | 100 | real__ = efl_loop_exit_code_process(ret__); \ |
101 | __EFL_MAIN_DESTRUCTOR; \ | 101 | __EFL_MAIN_DESTRUCTOR; \ |
102 | ecore_shutdown_ex(); \ | 102 | ecore_shutdown_ex(); \ |
@@ -117,10 +117,10 @@ | |||
117 | _efl_startup_time = ecore_time_unix_get(); \ | 117 | _efl_startup_time = ecore_time_unix_get(); \ |
118 | _EFL_APP_VERSION_SET(); \ | 118 | _EFL_APP_VERSION_SET(); \ |
119 | ecore_init(); \ | 119 | ecore_init(); \ |
120 | efl_event_callback_array_add(ecore_main_loop_get(), _efl_main_ex(), NULL); \ | 120 | efl_event_callback_array_add(efl_main_loop_get(), _efl_main_ex(), NULL); \ |
121 | ecore_init_ex(argc, argv); \ | 121 | ecore_init_ex(argc, argv); \ |
122 | __EFL_MAIN_CONSTRUCTOR; \ | 122 | __EFL_MAIN_CONSTRUCTOR; \ |
123 | ret__ = efl_loop_begin(ecore_main_loop_get()); \ | 123 | ret__ = efl_loop_begin(efl_main_loop_get()); \ |
124 | real__ = efl_loop_exit_code_process(ret__); \ | 124 | real__ = efl_loop_exit_code_process(ret__); \ |
125 | __EFL_MAIN_DESTRUCTOR; \ | 125 | __EFL_MAIN_DESTRUCTOR; \ |
126 | ecore_shutdown_ex(); \ | 126 | ecore_shutdown_ex(); \ |
diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c index 5dc1e3fdec..f77703e249 100644 --- a/src/lib/ecore/efl_loop.c +++ b/src/lib/ecore/efl_loop.c | |||
@@ -61,7 +61,7 @@ _efl_loop_main_get(Efl_Class *klass EINA_UNUSED, void *_pd EINA_UNUSED) | |||
61 | } | 61 | } |
62 | 62 | ||
63 | EAPI Eo * | 63 | EAPI Eo * |
64 | ecore_main_loop_get(void) | 64 | efl_main_loop_get(void) |
65 | { | 65 | { |
66 | return efl_loop_main_get(EFL_LOOP_CLASS); | 66 | return efl_loop_main_get(EFL_LOOP_CLASS); |
67 | } | 67 | } |
@@ -112,7 +112,7 @@ efl_exit(int exit_code) | |||
112 | 112 | ||
113 | eina_value_setup(&v, EINA_VALUE_TYPE_INT); | 113 | eina_value_setup(&v, EINA_VALUE_TYPE_INT); |
114 | eina_value_set(&v, &exit_code); | 114 | eina_value_set(&v, &exit_code); |
115 | efl_loop_quit(ecore_main_loop_get(), v); | 115 | efl_loop_quit(efl_main_loop_get(), v); |
116 | } | 116 | } |
117 | 117 | ||
118 | EOLIAN static Efl_Object * | 118 | EOLIAN static Efl_Object * |
@@ -368,7 +368,7 @@ _efl_loop_arguments_send(void *data, const Eina_Value v, | |||
368 | arge.initialization = initialization; | 368 | arge.initialization = initialization; |
369 | initialization = EINA_FALSE; | 369 | initialization = EINA_FALSE; |
370 | 370 | ||
371 | efl_event_callback_call(ecore_main_loop_get(), | 371 | efl_event_callback_call(efl_main_loop_get(), |
372 | EFL_LOOP_EVENT_ARGUMENTS, &arge); | 372 | EFL_LOOP_EVENT_ARGUMENTS, &arge); |
373 | on_error: | 373 | on_error: |
374 | _efl_loop_arguments_cleanup(arga); | 374 | _efl_loop_arguments_cleanup(arga); |
@@ -389,9 +389,9 @@ ecore_loop_arguments_send(int argc, const char **argv) | |||
389 | for (i = 0; i < argc; i++) | 389 | for (i = 0; i < argc; i++) |
390 | eina_array_push(arga, eina_stringshare_add(argv[i])); | 390 | eina_array_push(arga, eina_stringshare_add(argv[i])); |
391 | 391 | ||
392 | job = eina_future_then(efl_loop_job(ecore_main_loop_get()), | 392 | job = eina_future_then(efl_loop_job(efl_main_loop_get()), |
393 | _efl_loop_arguments_send, arga); | 393 | _efl_loop_arguments_send, arga); |
394 | efl_future_Eina_FutureXXX_then(ecore_main_loop_get(), job); | 394 | efl_future_Eina_FutureXXX_then(efl_main_loop_get(), job); |
395 | } | 395 | } |
396 | 396 | ||
397 | // Only one main loop handle for now | 397 | // Only one main loop handle for now |
diff --git a/src/lib/ecore/efl_loop_consumer.c b/src/lib/ecore/efl_loop_consumer.c index f984909e1a..670e91bbc6 100644 --- a/src/lib/ecore/efl_loop_consumer.c +++ b/src/lib/ecore/efl_loop_consumer.c | |||
@@ -17,7 +17,7 @@ _efl_loop_consumer_loop_get(Eo *obj, Efl_Loop_Consumer_Data *pd EINA_UNUSED) | |||
17 | Efl_Loop *loop = efl_provider_find(obj, EFL_LOOP_CLASS); | 17 | Efl_Loop *loop = efl_provider_find(obj, EFL_LOOP_CLASS); |
18 | if (!loop && eina_main_loop_is()) | 18 | if (!loop && eina_main_loop_is()) |
19 | { | 19 | { |
20 | loop = ecore_main_loop_get(); | 20 | loop = efl_main_loop_get(); |
21 | ERR("Failed to get the loop on object %p from the main thread! " | 21 | ERR("Failed to get the loop on object %p from the main thread! " |
22 | "Returning the main loop: %p", obj, loop); | 22 | "Returning the main loop: %p", obj, loop); |
23 | } | 23 | } |
diff --git a/src/lib/ecore/efl_model_composite_boolean.c b/src/lib/ecore/efl_model_composite_boolean.c index 62107bbffc..d8c8e38376 100644 --- a/src/lib/ecore/efl_model_composite_boolean.c +++ b/src/lib/ecore/efl_model_composite_boolean.c | |||
@@ -160,7 +160,7 @@ _efl_model_composite_boolean_children_efl_model_property_get(Eo *obj EINA_UNUSED | |||
160 | Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property); | 160 | Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property); |
161 | if (hv) | 161 | if (hv) |
162 | { | 162 | { |
163 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 163 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
164 | Efl_Future *rfuture = efl_promise_future_get(promise); | 164 | Efl_Future *rfuture = efl_promise_future_get(promise); |
165 | 165 | ||
166 | Eina_Value *eina_value = eina_value_new(EINA_VALUE_TYPE_UCHAR); | 166 | Eina_Value *eina_value = eina_value_new(EINA_VALUE_TYPE_UCHAR); |
@@ -180,7 +180,7 @@ _efl_model_composite_boolean_children_efl_model_property_get(Eo *obj EINA_UNUSED | |||
180 | return efl_model_property_get(pd->composite_child, property); | 180 | return efl_model_property_get(pd->composite_child, property); |
181 | else | 181 | else |
182 | { | 182 | { |
183 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 183 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
184 | Efl_Future *rfuture = efl_promise_future_get(promise); | 184 | Efl_Future *rfuture = efl_promise_future_get(promise); |
185 | 185 | ||
186 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); | 186 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); |
@@ -192,7 +192,7 @@ static Efl_Future * | |||
192 | _efl_model_composite_boolean_children_efl_model_property_set(Eo *obj EINA_UNUSED, | 192 | _efl_model_composite_boolean_children_efl_model_property_set(Eo *obj EINA_UNUSED, |
193 | Efl_Model_Composite_Boolean_Children_Data *pd, const char *property, const Eina_Value *value) | 193 | Efl_Model_Composite_Boolean_Children_Data *pd, const char *property, const Eina_Value *value) |
194 | { | 194 | { |
195 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 195 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
196 | Efl_Future *rfuture = efl_promise_future_get(promise); | 196 | Efl_Future *rfuture = efl_promise_future_get(promise); |
197 | 197 | ||
198 | Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property); | 198 | Efl_Model_Hash_Value *hv = eina_hash_find(pd->parent_pd->values, property); |
@@ -567,7 +567,7 @@ _efl_model_composite_boolean_efl_model_property_get(Eo *obj EINA_UNUSED, | |||
567 | if (pd->composite_model) | 567 | if (pd->composite_model) |
568 | return efl_model_property_get(pd->composite_model, property); | 568 | return efl_model_property_get(pd->composite_model, property); |
569 | 569 | ||
570 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 570 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
571 | Efl_Future *rfuture = efl_promise_future_get(promise); | 571 | Efl_Future *rfuture = efl_promise_future_get(promise); |
572 | 572 | ||
573 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); | 573 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); |
@@ -579,7 +579,7 @@ _efl_model_composite_boolean_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Mod | |||
579 | const char *property, const Eina_Value *value) | 579 | const char *property, const Eina_Value *value) |
580 | { | 580 | { |
581 | 581 | ||
582 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 582 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
583 | Efl_Future *rfuture = efl_promise_future_get(promise); | 583 | Efl_Future *rfuture = efl_promise_future_get(promise); |
584 | 584 | ||
585 | if (pd->composite_model) | 585 | if (pd->composite_model) |
@@ -598,7 +598,7 @@ _efl_model_composite_boolean_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Mod | |||
598 | static Efl_Future * | 598 | static Efl_Future * |
599 | _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj, Efl_Model_Composite_Boolean_Data *pd, unsigned int start, unsigned int count) | 599 | _efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj, Efl_Model_Composite_Boolean_Data *pd, unsigned int start, unsigned int count) |
600 | { | 600 | { |
601 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 601 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
602 | Efl_Future *rfuture = efl_promise_future_get(promise); | 602 | Efl_Future *rfuture = efl_promise_future_get(promise); |
603 | 603 | ||
604 | if (pd->composite_model) | 604 | if (pd->composite_model) |
@@ -632,7 +632,7 @@ _efl_model_composite_boolean_efl_model_children_count_get(Eo *obj EINA_UNUSED, E | |||
632 | return efl_model_children_count_get(pd->composite_model); | 632 | return efl_model_children_count_get(pd->composite_model); |
633 | else | 633 | else |
634 | { | 634 | { |
635 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 635 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
636 | Efl_Future *rfuture = efl_promise_future_get(promise); | 636 | Efl_Future *rfuture = efl_promise_future_get(promise); |
637 | 637 | ||
638 | unsigned int *count = malloc(sizeof(unsigned int)); | 638 | unsigned int *count = malloc(sizeof(unsigned int)); |
diff --git a/src/lib/ecore/efl_model_composite_selection.c b/src/lib/ecore/efl_model_composite_selection.c index b0695d53d5..dbbe43fc45 100644 --- a/src/lib/ecore/efl_model_composite_selection.c +++ b/src/lib/ecore/efl_model_composite_selection.c | |||
@@ -176,7 +176,7 @@ _efl_model_composite_selection_children_efl_model_property_set(Eo *obj EINA_UNUS | |||
176 | } | 176 | } |
177 | else | 177 | else |
178 | { | 178 | { |
179 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 179 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
180 | Efl_Future *rfuture = efl_promise_future_get(promise); | 180 | Efl_Future *rfuture = efl_promise_future_get(promise); |
181 | Eina_Value* true_value = eina_value_new(EINA_VALUE_TYPE_UCHAR); | 181 | Eina_Value* true_value = eina_value_new(EINA_VALUE_TYPE_UCHAR); |
182 | eina_value_set(true_value, EINA_TRUE); | 182 | eina_value_set(true_value, EINA_TRUE); |
diff --git a/src/lib/ecore/efl_model_container.c b/src/lib/ecore/efl_model_container.c index 69a5704353..71bb9f192b 100644 --- a/src/lib/ecore/efl_model_container.c +++ b/src/lib/ecore/efl_model_container.c | |||
@@ -236,7 +236,7 @@ _efl_model_container_efl_model_properties_get(Eo *obj EINA_UNUSED, Efl_Model_Con | |||
236 | Efl_Future * | 236 | Efl_Future * |
237 | _efl_model_container_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED, const Eina_Value *value EINA_UNUSED) | 237 | _efl_model_container_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED, const Eina_Value *value EINA_UNUSED) |
238 | { | 238 | { |
239 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 239 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
240 | Efl_Future* future = efl_promise_future_get(promise); | 240 | Efl_Future* future = efl_promise_future_get(promise); |
241 | 241 | ||
242 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); | 242 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); |
@@ -247,7 +247,7 @@ Efl_Future * | |||
247 | _efl_model_container_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED) | 247 | _efl_model_container_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd EINA_UNUSED, const char *property EINA_UNUSED) |
248 | { | 248 | { |
249 | 249 | ||
250 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 250 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
251 | Efl_Future* future = efl_promise_future_get(promise); | 251 | Efl_Future* future = efl_promise_future_get(promise); |
252 | 252 | ||
253 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); | 253 | efl_promise_failed_set(promise, EFL_MODEL_ERROR_NOT_FOUND); |
@@ -257,7 +257,7 @@ _efl_model_container_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Conta | |||
257 | static Efl_Future * | 257 | static Efl_Future * |
258 | _efl_model_container_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd, unsigned int start, unsigned int count) | 258 | _efl_model_container_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd, unsigned int start, unsigned int count) |
259 | { | 259 | { |
260 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 260 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
261 | Efl_Future* future = efl_promise_future_get(promise); | 261 | Efl_Future* future = efl_promise_future_get(promise); |
262 | 262 | ||
263 | Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count); | 263 | Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count); |
@@ -269,7 +269,7 @@ _efl_model_container_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model | |||
269 | static Efl_Future * | 269 | static Efl_Future * |
270 | _efl_model_container_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd) | 270 | _efl_model_container_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Data *sd) |
271 | { | 271 | { |
272 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 272 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
273 | Efl_Future* future = efl_promise_future_get(promise); | 273 | Efl_Future* future = efl_promise_future_get(promise); |
274 | 274 | ||
275 | unsigned int *count = calloc(1, sizeof(unsigned int)); | 275 | unsigned int *count = calloc(1, sizeof(unsigned int)); |
diff --git a/src/lib/ecore/efl_model_container_item.c b/src/lib/ecore/efl_model_container_item.c index 945c0c9ce0..cb95c2f4db 100644 --- a/src/lib/ecore/efl_model_container_item.c +++ b/src/lib/ecore/efl_model_container_item.c | |||
@@ -44,7 +44,7 @@ _efl_model_container_item_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_ | |||
44 | Eina_Stringshare *prop_name; | 44 | Eina_Stringshare *prop_name; |
45 | Child_Property_Data *cpd; | 45 | Child_Property_Data *cpd; |
46 | void *data, *new_data; | 46 | void *data, *new_data; |
47 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 47 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
48 | Efl_Future* future = efl_promise_future_get(promise); | 48 | Efl_Future* future = efl_promise_future_get(promise); |
49 | 49 | ||
50 | if (!sd->parent_data) | 50 | if (!sd->parent_data) |
@@ -105,7 +105,7 @@ _efl_model_container_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_ | |||
105 | Eina_Stringshare *prop_name; | 105 | Eina_Stringshare *prop_name; |
106 | Child_Property_Data *cpd; | 106 | Child_Property_Data *cpd; |
107 | Eina_Value *value; | 107 | Eina_Value *value; |
108 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 108 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
109 | Efl_Future* future = efl_promise_future_get(promise); | 109 | Efl_Future* future = efl_promise_future_get(promise); |
110 | 110 | ||
111 | if (!sd->parent_data) | 111 | if (!sd->parent_data) |
@@ -152,7 +152,7 @@ _efl_model_container_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_ | |||
152 | EOLIAN static Efl_Future * | 152 | EOLIAN static Efl_Future * |
153 | _efl_model_container_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED, unsigned int start EINA_UNUSED, unsigned int count EINA_UNUSED) | 153 | _efl_model_container_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED, unsigned int start EINA_UNUSED, unsigned int count EINA_UNUSED) |
154 | { | 154 | { |
155 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 155 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
156 | Efl_Future* future = efl_promise_future_get(promise); | 156 | Efl_Future* future = efl_promise_future_get(promise); |
157 | 157 | ||
158 | efl_promise_value_set(promise, NULL, NULL); | 158 | efl_promise_value_set(promise, NULL, NULL); |
@@ -163,7 +163,7 @@ _efl_model_container_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_ | |||
163 | EOLIAN static Efl_Future * | 163 | EOLIAN static Efl_Future * |
164 | _efl_model_container_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED) | 164 | _efl_model_container_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Container_Item_Data *sd EINA_UNUSED) |
165 | { | 165 | { |
166 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 166 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
167 | Efl_Future* future = efl_promise_future_get(promise); | 167 | Efl_Future* future = efl_promise_future_get(promise); |
168 | 168 | ||
169 | unsigned int *count = calloc(1, sizeof(unsigned int)); | 169 | unsigned int *count = calloc(1, sizeof(unsigned int)); |
diff --git a/src/lib/ecore/efl_model_item.c b/src/lib/ecore/efl_model_item.c index 8afc0a77a4..571f3e4131 100644 --- a/src/lib/ecore/efl_model_item.c +++ b/src/lib/ecore/efl_model_item.c | |||
@@ -70,7 +70,7 @@ _efl_model_item_efl_model_properties_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Dat | |||
70 | static Efl_Future* | 70 | static Efl_Future* |
71 | _efl_model_item_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property, const Eina_Value *value) | 71 | _efl_model_item_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property, const Eina_Value *value) |
72 | { | 72 | { |
73 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 73 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
74 | Efl_Future* future = efl_promise_future_get(promise); | 74 | Efl_Future* future = efl_promise_future_get(promise); |
75 | Efl_Model_Property_Event evt; | 75 | Efl_Model_Property_Event evt; |
76 | 76 | ||
@@ -119,7 +119,7 @@ err1: | |||
119 | static Efl_Future * | 119 | static Efl_Future * |
120 | _efl_model_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property) | 120 | _efl_model_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, const char *property) |
121 | { | 121 | { |
122 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 122 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
123 | Efl_Future *rfuture = efl_promise_future_get(promise); | 123 | Efl_Future *rfuture = efl_promise_future_get(promise); |
124 | 124 | ||
125 | Eina_Stringshare *sshare = eina_stringshare_add(property); | 125 | Eina_Stringshare *sshare = eina_stringshare_add(property); |
@@ -136,7 +136,7 @@ _efl_model_item_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data | |||
136 | static Efl_Future * | 136 | static Efl_Future * |
137 | _efl_model_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, unsigned int start, unsigned int count) | 137 | _efl_model_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd, unsigned int start, unsigned int count) |
138 | { | 138 | { |
139 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 139 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
140 | Efl_Future *rfuture = efl_promise_future_get(promise); | 140 | Efl_Future *rfuture = efl_promise_future_get(promise); |
141 | 141 | ||
142 | Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count); | 142 | Eina_Accessor* accessor = efl_model_list_slice(sd->children, start, count); |
@@ -148,7 +148,7 @@ _efl_model_item_efl_model_children_slice_get(Eo *obj EINA_UNUSED, Efl_Model_Item | |||
148 | static Efl_Future * | 148 | static Efl_Future * |
149 | _efl_model_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd) | 149 | _efl_model_item_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Item_Data *sd) |
150 | { | 150 | { |
151 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get()); | 151 | Efl_Promise *promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get()); |
152 | Efl_Future *rfuture = efl_promise_future_get(promise); | 152 | Efl_Future *rfuture = efl_promise_future_get(promise); |
153 | 153 | ||
154 | unsigned int *count = calloc(1, sizeof(unsigned int)); | 154 | unsigned int *count = calloc(1, sizeof(unsigned int)); |
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index eb5535f266..2cf721ffea 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c | |||
@@ -818,7 +818,7 @@ _ecore_con_client_ssl_upgrade_job(void *data, const Eina_Value v, | |||
818 | const Eina_Future *dead EINA_UNUSED) | 818 | const Eina_Future *dead EINA_UNUSED) |
819 | { | 819 | { |
820 | Ecore_Con_Client *cl = data; | 820 | Ecore_Con_Client *cl = data; |
821 | Eo *loop = ecore_main_loop_get(); | 821 | Eo *loop = efl_main_loop_get(); |
822 | Eo *inner_socket; | 822 | Eo *inner_socket; |
823 | Eo *socket; | 823 | Eo *socket; |
824 | Eo *tcp_socket; | 824 | Eo *tcp_socket; |
@@ -1604,7 +1604,7 @@ _ecore_con_server_server_ssl_job(void *data, const Eina_Value v, | |||
1604 | const Eina_Future *dead EINA_UNUSED) | 1604 | const Eina_Future *dead EINA_UNUSED) |
1605 | { | 1605 | { |
1606 | Ecore_Con_Server *svr = data; | 1606 | Ecore_Con_Server *svr = data; |
1607 | Eo *loop = ecore_main_loop_get(); | 1607 | Eo *loop = efl_main_loop_get(); |
1608 | Eo *ssl_ctx; | 1608 | Eo *ssl_ctx; |
1609 | Eo *inner_server; | 1609 | Eo *inner_server; |
1610 | Eo *server; | 1610 | Eo *server; |
@@ -1674,7 +1674,7 @@ ecore_con_server_add(Ecore_Con_Type compl_type, | |||
1674 | 1674 | ||
1675 | type = compl_type & ECORE_CON_TYPE; | 1675 | type = compl_type & ECORE_CON_TYPE; |
1676 | 1676 | ||
1677 | loop = ecore_main_loop_get(); | 1677 | loop = efl_main_loop_get(); |
1678 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL); | 1678 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL); |
1679 | 1679 | ||
1680 | svr = _ecore_con_server_new(EINA_FALSE, compl_type, name, port, data); | 1680 | svr = _ecore_con_server_new(EINA_FALSE, compl_type, name, port, data); |
@@ -1937,7 +1937,7 @@ _ecore_con_server_dialer_ssl_job(void *data, const Eina_Value v, | |||
1937 | const Eina_Future *dead EINA_UNUSED) | 1937 | const Eina_Future *dead EINA_UNUSED) |
1938 | { | 1938 | { |
1939 | Ecore_Con_Server *svr = data; | 1939 | Ecore_Con_Server *svr = data; |
1940 | Eo *loop = ecore_main_loop_get(); | 1940 | Eo *loop = efl_main_loop_get(); |
1941 | Eo *ssl_ctx; | 1941 | Eo *ssl_ctx; |
1942 | Eo *inner_dialer; | 1942 | Eo *inner_dialer; |
1943 | Eo *dialer; | 1943 | Eo *dialer; |
@@ -2027,7 +2027,7 @@ _ecore_con_server_dialer_ssl_upgrade_job(void *data, const Eina_Value v, | |||
2027 | const Eina_Future *dead EINA_UNUSED) | 2027 | const Eina_Future *dead EINA_UNUSED) |
2028 | { | 2028 | { |
2029 | Ecore_Con_Server *svr = data; | 2029 | Ecore_Con_Server *svr = data; |
2030 | Eo *loop = ecore_main_loop_get(); | 2030 | Eo *loop = efl_main_loop_get(); |
2031 | Eo *ssl_ctx; | 2031 | Eo *ssl_ctx; |
2032 | Eo *inner_dialer; | 2032 | Eo *inner_dialer; |
2033 | Eo *dialer; | 2033 | Eo *dialer; |
@@ -2131,7 +2131,7 @@ ecore_con_server_connect(Ecore_Con_Type compl_type, | |||
2131 | 2131 | ||
2132 | type = compl_type & ECORE_CON_TYPE; | 2132 | type = compl_type & ECORE_CON_TYPE; |
2133 | 2133 | ||
2134 | loop = ecore_main_loop_get(); | 2134 | loop = efl_main_loop_get(); |
2135 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL); | 2135 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, NULL); |
2136 | 2136 | ||
2137 | svr = _ecore_con_server_new(EINA_TRUE, compl_type, name, port, data); | 2137 | svr = _ecore_con_server_new(EINA_TRUE, compl_type, name, port, data); |
diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c index a05866f750..e8ca8c4cdf 100644 --- a/src/lib/ecore_con/ecore_con_url.c +++ b/src/lib/ecore_con/ecore_con_url.c | |||
@@ -704,7 +704,7 @@ _ecore_con_url_request_prepare(Ecore_Con_Url *url_con, const char *method) | |||
704 | if (proxy_url) | 704 | if (proxy_url) |
705 | DBG("proxy_url='%s'", proxy_url); | 705 | DBG("proxy_url='%s'", proxy_url); |
706 | 706 | ||
707 | url_con->dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, ecore_main_loop_get(), | 707 | url_con->dialer = efl_add(EFL_NET_DIALER_HTTP_CLASS, efl_main_loop_get(), |
708 | efl_net_dialer_http_method_set(efl_added, url_con->custom_request ? url_con->custom_request : method), | 708 | efl_net_dialer_http_method_set(efl_added, url_con->custom_request ? url_con->custom_request : method), |
709 | efl_net_dialer_http_primary_mode_set(efl_added, (strcmp(method, "PUT") == 0) ? EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD : EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD), | 709 | efl_net_dialer_http_primary_mode_set(efl_added, (strcmp(method, "PUT") == 0) ? EFL_NET_DIALER_HTTP_PRIMARY_MODE_UPLOAD : EFL_NET_DIALER_HTTP_PRIMARY_MODE_DOWNLOAD), |
710 | efl_net_dialer_proxy_set(efl_added, proxy_url), | 710 | efl_net_dialer_proxy_set(efl_added, proxy_url), |
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c index 99635ff1ba..5d667bbcd9 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.c +++ b/src/lib/ecore_con/efl_net_dialer_http.c | |||
@@ -863,7 +863,7 @@ _efl_net_dialer_http_curl_safe_end(Eo *o, Efl_Net_Dialer_Http_Data *pd, CURL *ea | |||
863 | /* object deleted from CURL callback, CURL* easy was | 863 | /* object deleted from CURL callback, CURL* easy was |
864 | * dissociated and we must delete it ourselves. | 864 | * dissociated and we must delete it ourselves. |
865 | */ | 865 | */ |
866 | f = efl_loop_job(ecore_main_loop_get()); | 866 | f = efl_loop_job(efl_main_loop_get()); |
867 | eina_future_then_from_desc(f, eina_future_cb_easy(.success = _efl_net_dialer_http_curl_cleanup, | 867 | eina_future_then_from_desc(f, eina_future_cb_easy(.success = _efl_net_dialer_http_curl_cleanup, |
868 | .error = _efl_net_dialer_http_curl_cleanup_error, | 868 | .error = _efl_net_dialer_http_curl_cleanup_error, |
869 | .data = easy)); | 869 | .data = easy)); |
diff --git a/src/lib/ecore_con/efl_net_ip_address.c b/src/lib/ecore_con/efl_net_ip_address.c index 252b6e6a22..13e14a052d 100644 --- a/src/lib/ecore_con/efl_net_ip_address.c +++ b/src/lib/ecore_con/efl_net_ip_address.c | |||
@@ -547,7 +547,7 @@ _efl_net_ip_address_resolve(Eo *cls EINA_UNUSED, void *pd EINA_UNUSED, const cha | |||
547 | ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx); | 547 | ctx->thread = efl_net_ip_resolve_async_new(host, port, &hints, _efl_net_ip_address_resolve_done, ctx); |
548 | EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread); | 548 | EINA_SAFETY_ON_NULL_GOTO(ctx->thread, error_thread); |
549 | 549 | ||
550 | ctx->promise = efl_add(EFL_PROMISE_CLASS, ecore_main_loop_get(), | 550 | ctx->promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get(), |
551 | efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_net_ip_address_resolve_del, ctx)); | 551 | efl_event_callback_add(efl_added, EFL_EVENT_DEL, _efl_net_ip_address_resolve_del, ctx)); |
552 | EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise); | 552 | EINA_SAFETY_ON_NULL_GOTO(ctx->promise, error_promise); |
553 | 553 | ||
diff --git a/src/lib/ecore_file/ecore_file_download.c b/src/lib/ecore_file/ecore_file_download.c index bcb83935dd..1323dbc8e6 100644 --- a/src/lib/ecore_file/ecore_file_download.c +++ b/src/lib/ecore_file/ecore_file_download.c | |||
@@ -215,7 +215,7 @@ ecore_file_download_full(const char *url, | |||
215 | return EINA_FALSE; | 215 | return EINA_FALSE; |
216 | } | 216 | } |
217 | 217 | ||
218 | loop = ecore_main_loop_get(); | 218 | loop = efl_main_loop_get(); |
219 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, EINA_FALSE); | 219 | EINA_SAFETY_ON_NULL_RETURN_VAL(loop, EINA_FALSE); |
220 | 220 | ||
221 | job = calloc(1, sizeof(Ecore_File_Download_Job)); | 221 | job = calloc(1, sizeof(Ecore_File_Download_Job)); |
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index 7dbdb92d16..c0fcd8be63 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c | |||
@@ -382,7 +382,7 @@ EAPI Ecore_Ipc_Server * | |||
382 | ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data) | 382 | ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data) |
383 | { | 383 | { |
384 | Ecore_Ipc_Server *svr; | 384 | Ecore_Ipc_Server *svr; |
385 | Eo *loop = ecore_main_loop_get(); | 385 | Eo *loop = efl_main_loop_get(); |
386 | char *address = NULL; | 386 | char *address = NULL; |
387 | Eina_Error err; | 387 | Eina_Error err; |
388 | #ifdef EFL_NET_SERVER_UNIX_CLASS | 388 | #ifdef EFL_NET_SERVER_UNIX_CLASS |
@@ -404,7 +404,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
404 | 404 | ||
405 | new_mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH; | 405 | new_mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH; |
406 | 406 | ||
407 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get(), | 407 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get(), |
408 | efl_net_server_unix_leading_directories_create_set(efl_added, EINA_TRUE, S_IRUSR | S_IWUSR | S_IXUSR)); | 408 | efl_net_server_unix_leading_directories_create_set(efl_added, EINA_TRUE, S_IRUSR | S_IWUSR | S_IXUSR)); |
409 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 409 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
410 | } | 410 | } |
@@ -418,7 +418,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
418 | new_mask = 0; | 418 | new_mask = 0; |
419 | local_system = EINA_TRUE; | 419 | local_system = EINA_TRUE; |
420 | 420 | ||
421 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get()); | 421 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get()); |
422 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 422 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
423 | } | 423 | } |
424 | #endif /* EFL_NET_SERVER_UNIX_CLASS */ | 424 | #endif /* EFL_NET_SERVER_UNIX_CLASS */ |
@@ -431,7 +431,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
431 | // TODO: specify SECURITY_ATTRIBUTES to use or some | 431 | // TODO: specify SECURITY_ATTRIBUTES to use or some |
432 | // Efl_Net_Server_Windows API to limit access | 432 | // Efl_Net_Server_Windows API to limit access |
433 | 433 | ||
434 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get()); | 434 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get()); |
435 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 435 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
436 | } | 436 | } |
437 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 437 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -442,7 +442,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
442 | // TODO: specify SECURITY_ATTRIBUTES to use or some | 442 | // TODO: specify SECURITY_ATTRIBUTES to use or some |
443 | // Efl_Net_Server_Windows API to limit access | 443 | // Efl_Net_Server_Windows API to limit access |
444 | 444 | ||
445 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get()); | 445 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get()); |
446 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 446 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
447 | } | 447 | } |
448 | #endif /* EFL_NET_SERVER_WINDOWS_CLASS */ | 448 | #endif /* EFL_NET_SERVER_WINDOWS_CLASS */ |
@@ -653,7 +653,7 @@ EAPI Ecore_Ipc_Server * | |||
653 | ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data) | 653 | ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data) |
654 | { | 654 | { |
655 | Ecore_Ipc_Server *svr; | 655 | Ecore_Ipc_Server *svr; |
656 | Eo *loop = ecore_main_loop_get(); | 656 | Eo *loop = efl_main_loop_get(); |
657 | char *address = NULL; | 657 | char *address = NULL; |
658 | Eina_Error err; | 658 | Eina_Error err; |
659 | 659 | ||
@@ -681,7 +681,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
681 | goto error_dialer; | 681 | goto error_dialer; |
682 | } | 682 | } |
683 | 683 | ||
684 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get()); | 684 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get()); |
685 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 685 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
686 | } | 686 | } |
687 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 687 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -689,7 +689,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
689 | address = ecore_con_local_path_new(EINA_TRUE, name, port); | 689 | address = ecore_con_local_path_new(EINA_TRUE, name, port); |
690 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 690 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
691 | 691 | ||
692 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get()); | 692 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get()); |
693 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 693 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
694 | } | 694 | } |
695 | #endif /* EFL_NET_DIALER_UNIX_CLASS */ | 695 | #endif /* EFL_NET_DIALER_UNIX_CLASS */ |
@@ -699,7 +699,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
699 | address = ecore_con_local_path_new(EINA_FALSE, name, port); | 699 | address = ecore_con_local_path_new(EINA_FALSE, name, port); |
700 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 700 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
701 | 701 | ||
702 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get()); | 702 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get()); |
703 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 703 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
704 | } | 704 | } |
705 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 705 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -707,7 +707,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
707 | address = ecore_con_local_path_new(EINA_TRUE, name, port); | 707 | address = ecore_con_local_path_new(EINA_TRUE, name, port); |
708 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 708 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
709 | 709 | ||
710 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get()); | 710 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get()); |
711 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 711 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
712 | } | 712 | } |
713 | #endif /* EFL_NET_DIALER_WINDOWS_CLASS */ | 713 | #endif /* EFL_NET_DIALER_WINDOWS_CLASS */ |
diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c index bd96acca4b..551b4f2e6e 100644 --- a/src/lib/edje/edje_main.c +++ b/src/lib/edje/edje_main.c | |||
@@ -85,9 +85,9 @@ edje_init(void) | |||
85 | _edje_scale = FROM_DOUBLE(1.0); | 85 | _edje_scale = FROM_DOUBLE(1.0); |
86 | _edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, NULL); | 86 | _edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, NULL); |
87 | if (!_edje_global_obj || | 87 | if (!_edje_global_obj || |
88 | !efl_loop_register(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj) || | 88 | !efl_loop_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj) || |
89 | !efl_loop_register(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj) || | 89 | !efl_loop_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj) || |
90 | !efl_loop_register(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj)) | 90 | !efl_loop_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj)) |
91 | goto shutdown_efreet; | 91 | goto shutdown_efreet; |
92 | 92 | ||
93 | _edje_edd_init(); | 93 | _edje_edd_init(); |
@@ -150,9 +150,9 @@ shutdown_all: | |||
150 | _edje_edd_shutdown(); | 150 | _edje_edd_shutdown(); |
151 | if (_edje_global_obj) | 151 | if (_edje_global_obj) |
152 | { | 152 | { |
153 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); | 153 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); |
154 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); | 154 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); |
155 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); | 155 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); |
156 | efl_del(_edje_global_obj); | 156 | efl_del(_edje_global_obj); |
157 | _edje_global_obj = NULL; | 157 | _edje_global_obj = NULL; |
158 | } | 158 | } |
@@ -209,9 +209,9 @@ _edje_shutdown_core(void) | |||
209 | _edje_text_class_hash_free(); | 209 | _edje_text_class_hash_free(); |
210 | _edje_size_class_hash_free(); | 210 | _edje_size_class_hash_free(); |
211 | _edje_edd_shutdown(); | 211 | _edje_edd_shutdown(); |
212 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); | 212 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj); |
213 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); | 213 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj); |
214 | efl_loop_unregister(ecore_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); | 214 | efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj); |
215 | efl_del(_edje_global_obj); | 215 | efl_del(_edje_global_obj); |
216 | _edje_global_obj = NULL; | 216 | _edje_global_obj = NULL; |
217 | 217 | ||
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h index 217aa48c22..79737c12a7 100644 --- a/src/lib/edje/edje_private.h +++ b/src/lib/edje/edje_private.h | |||
@@ -2402,7 +2402,7 @@ static inline Edje_Global * | |||
2402 | _edje_global(void) | 2402 | _edje_global(void) |
2403 | { | 2403 | { |
2404 | #ifndef NDEBUG | 2404 | #ifndef NDEBUG |
2405 | return efl_provider_find(ecore_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE); | 2405 | return efl_provider_find(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE); |
2406 | #else | 2406 | #else |
2407 | extern Edje_Global *_edje_global_obj; | 2407 | extern Edje_Global *_edje_global_obj; |
2408 | return _edje_global_obj; | 2408 | return _edje_global_obj; |
diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c index e2a2b03925..44c4e9dfc0 100644 --- a/src/lib/eio/eio_main.c +++ b/src/lib/eio/eio_main.c | |||
@@ -319,8 +319,8 @@ eio_init(void) | |||
319 | 319 | ||
320 | efreet_mime_init(); | 320 | efreet_mime_init(); |
321 | 321 | ||
322 | io_manager = efl_add(EFL_IO_MANAGER_CLASS, ecore_main_loop_get()); | 322 | io_manager = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get()); |
323 | efl_loop_register(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager); | 323 | efl_loop_register(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager); |
324 | 324 | ||
325 | eina_log_timing(_eio_log_dom_global, | 325 | eina_log_timing(_eio_log_dom_global, |
326 | EINA_LOG_STATE_STOP, | 326 | EINA_LOG_STATE_STOP, |
@@ -358,7 +358,7 @@ eio_shutdown(void) | |||
358 | EINA_LOG_STATE_START, | 358 | EINA_LOG_STATE_START, |
359 | EINA_LOG_STATE_SHUTDOWN); | 359 | EINA_LOG_STATE_SHUTDOWN); |
360 | 360 | ||
361 | efl_loop_unregister(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager); | 361 | efl_loop_unregister(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager); |
362 | efl_del(io_manager); | 362 | efl_del(io_manager); |
363 | io_manager = NULL; | 363 | io_manager = NULL; |
364 | 364 | ||
diff --git a/src/lib/eio/eio_model.c b/src/lib/eio/eio_model.c index 5ab4deb86f..cbed6ee19d 100644 --- a/src/lib/eio/eio_model.c +++ b/src/lib/eio/eio_model.c | |||
@@ -824,7 +824,7 @@ _eio_model_efl_object_provider_find(Eo *obj, Eio_Model_Data *priv EINA_UNUSED, c | |||
824 | 824 | ||
825 | // Provide main loop even if we don't have a loop user parent | 825 | // Provide main loop even if we don't have a loop user parent |
826 | if (!provider && (klass == EFL_LOOP_CLASS) && eina_main_loop_is()) | 826 | if (!provider && (klass == EFL_LOOP_CLASS) && eina_main_loop_is()) |
827 | return ecore_main_loop_get(); | 827 | return efl_main_loop_get(); |
828 | 828 | ||
829 | return provider; | 829 | return provider; |
830 | } | 830 | } |
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index eac6e88ce9..c97dcb51c9 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c | |||
@@ -5417,7 +5417,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Efl_U | |||
5417 | efl_access_window_created_signal_emit(obj); | 5417 | efl_access_window_created_signal_emit(obj); |
5418 | 5418 | ||
5419 | // attach config API | 5419 | // attach config API |
5420 | efl_composite_attach(obj, efl_provider_find(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS)); | 5420 | efl_composite_attach(obj, efl_provider_find(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS)); |
5421 | 5421 | ||
5422 | efl_event_callback_array_add(sd->evas, _elm_evas_tracking(), sd); | 5422 | efl_event_callback_array_add(sd->evas, _elm_evas_tracking(), sd); |
5423 | efl_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas); | 5423 | efl_event_callback_array_add(obj, _elm_win_evas_feed_fake_callbacks(), sd->evas); |
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 5b5481f865..8d83a5686a 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c | |||
@@ -1660,8 +1660,8 @@ static void | |||
1660 | _config_load(void) | 1660 | _config_load(void) |
1661 | { | 1661 | { |
1662 | _efl_config_obj = efl_add(EFL_CONFIG_GLOBAL_CLASS, NULL); | 1662 | _efl_config_obj = efl_add(EFL_CONFIG_GLOBAL_CLASS, NULL); |
1663 | efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj); | 1663 | efl_loop_register(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj); |
1664 | efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj); | 1664 | efl_loop_register(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj); |
1665 | efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del); | 1665 | efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del); |
1666 | _elm_config = _config_user_load(); | 1666 | _elm_config = _config_user_load(); |
1667 | if (_elm_config) | 1667 | if (_elm_config) |
@@ -4678,8 +4678,8 @@ void | |||
4678 | _elm_config_shutdown(void) | 4678 | _elm_config_shutdown(void) |
4679 | { | 4679 | { |
4680 | efl_del_intercept_set(_efl_config_obj, NULL); | 4680 | efl_del_intercept_set(_efl_config_obj, NULL); |
4681 | efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj); | 4681 | efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj); |
4682 | efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj); | 4682 | efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj); |
4683 | ELM_SAFE_FREE(_efl_config_obj, efl_del); | 4683 | ELM_SAFE_FREE(_efl_config_obj, efl_del); |
4684 | ELM_SAFE_FREE(_elm_config, _config_free); | 4684 | ELM_SAFE_FREE(_elm_config, _config_free); |
4685 | ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del); | 4685 | ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del); |
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c index 0201b61858..44f7a8de94 100644 --- a/src/lib/elementary/elm_glview.c +++ b/src/lib/elementary/elm_glview.c | |||
@@ -165,7 +165,7 @@ _render_cb(void *obj, const Efl_Event *event EINA_UNUSED) | |||
165 | return; | 165 | return; |
166 | 166 | ||
167 | on_error: | 167 | on_error: |
168 | efl_event_callback_del(ecore_main_loop_get(), | 168 | efl_event_callback_del(efl_main_loop_get(), |
169 | EFL_LOOP_EVENT_IDLE_ENTER, | 169 | EFL_LOOP_EVENT_IDLE_ENTER, |
170 | _render_cb, | 170 | _render_cb, |
171 | obj); | 171 | obj); |
@@ -187,7 +187,7 @@ _set_render_policy_callback(Evas_Object *obj) | |||
187 | evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h); | 187 | evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h); |
188 | } | 188 | } |
189 | // Delete idle_enterer if it for some reason is around | 189 | // Delete idle_enterer if it for some reason is around |
190 | efl_event_callback_del(ecore_main_loop_get(), | 190 | efl_event_callback_del(efl_main_loop_get(), |
191 | EFL_LOOP_EVENT_IDLE_ENTER, | 191 | EFL_LOOP_EVENT_IDLE_ENTER, |
192 | _render_cb, | 192 | _render_cb, |
193 | obj); | 193 | obj); |
@@ -202,7 +202,7 @@ _set_render_policy_callback(Evas_Object *obj) | |||
202 | 202 | ||
203 | case ELM_GLVIEW_RENDER_POLICY_ALWAYS: | 203 | case ELM_GLVIEW_RENDER_POLICY_ALWAYS: |
204 | if (evas_object_image_pixels_dirty_get(wd->resize_obj) && !sd->render_idle_enterer) | 204 | if (evas_object_image_pixels_dirty_get(wd->resize_obj) && !sd->render_idle_enterer) |
205 | sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(), | 205 | sd->render_idle_enterer = efl_event_callback_priority_add(efl_main_loop_get(), |
206 | EFL_LOOP_EVENT_IDLE_ENTER, | 206 | EFL_LOOP_EVENT_IDLE_ENTER, |
207 | EFL_CALLBACK_PRIORITY_BEFORE, | 207 | EFL_CALLBACK_PRIORITY_BEFORE, |
208 | _render_cb, | 208 | _render_cb, |
@@ -300,7 +300,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd) | |||
300 | //TODO:will be optimised | 300 | //TODO:will be optimised |
301 | efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL); | 301 | efl_event_callback_legacy_call(obj, ELM_GLVIEW_EVENT_DESTROYED, NULL); |
302 | 302 | ||
303 | efl_event_callback_del(ecore_main_loop_get(), | 303 | efl_event_callback_del(efl_main_loop_get(), |
304 | EFL_LOOP_EVENT_IDLE_ENTER, | 304 | EFL_LOOP_EVENT_IDLE_ENTER, |
305 | _render_cb, | 305 | _render_cb, |
306 | obj); | 306 | obj); |
@@ -532,7 +532,7 @@ _elm_glview_draw_request(Eo *obj, Elm_Glview_Data *sd) | |||
532 | evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h); | 532 | evas_object_image_data_update_add(wd->resize_obj, 0, 0, sd->w, sd->h); |
533 | if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS && | 533 | if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS && |
534 | !sd->render_idle_enterer) | 534 | !sd->render_idle_enterer) |
535 | sd->render_idle_enterer = efl_event_callback_priority_add(ecore_main_loop_get(), | 535 | sd->render_idle_enterer = efl_event_callback_priority_add(efl_main_loop_get(), |
536 | EFL_LOOP_EVENT_IDLE_ENTER, | 536 | EFL_LOOP_EVENT_IDLE_ENTER, |
537 | EFL_CALLBACK_PRIORITY_BEFORE, | 537 | EFL_CALLBACK_PRIORITY_BEFORE, |
538 | _render_cb, obj); | 538 | _render_cb, obj); |
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index f7224c5c73..b75d8a820a 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c | |||
@@ -1191,16 +1191,16 @@ elm_quicklaunch_fork(int argc, | |||
1191 | { | 1191 | { |
1192 | if (qre_pause && qre_resume && qre_terminate) | 1192 | if (qre_pause && qre_resume && qre_terminate) |
1193 | { | 1193 | { |
1194 | efl_event_callback_array_add(ecore_main_loop_get(), _qre_main_ex(), NULL); | 1194 | efl_event_callback_array_add(efl_main_loop_get(), _qre_main_ex(), NULL); |
1195 | } | 1195 | } |
1196 | else | 1196 | else |
1197 | { | 1197 | { |
1198 | efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL); | 1198 | efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, qre_main, NULL); |
1199 | } | 1199 | } |
1200 | 1200 | ||
1201 | ecore_init_ex(argc, argv); | 1201 | ecore_init_ex(argc, argv); |
1202 | 1202 | ||
1203 | ret = efl_loop_exit_code_process(efl_loop_begin(ecore_main_loop_get())); | 1203 | ret = efl_loop_exit_code_process(efl_loop_begin(efl_main_loop_get())); |
1204 | 1204 | ||
1205 | ecore_shutdown_ex(); | 1205 | ecore_shutdown_ex(); |
1206 | 1206 | ||
@@ -1347,12 +1347,12 @@ elm_policy_set(unsigned int policy, | |||
1347 | { | 1347 | { |
1348 | if (value == ELM_POLICY_EXIT_WINDOWS_DEL) | 1348 | if (value == ELM_POLICY_EXIT_WINDOWS_DEL) |
1349 | { | 1349 | { |
1350 | efl_event_callback_add(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, | 1350 | efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, |
1351 | _on_terminate, NULL); | 1351 | _on_terminate, NULL); |
1352 | } | 1352 | } |
1353 | else | 1353 | else |
1354 | { | 1354 | { |
1355 | efl_event_callback_del(ecore_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, | 1355 | efl_event_callback_del(efl_main_loop_get(), EFL_LOOP_EVENT_TERMINATE, |
1356 | _on_terminate, NULL); | 1356 | _on_terminate, NULL); |
1357 | } | 1357 | } |
1358 | } | 1358 | } |
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index f9f7dff5df..1e1cb07674 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c | |||
@@ -835,7 +835,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, | |||
835 | if (klass == EVAS_CANVAS_CLASS) | 835 | if (klass == EVAS_CANVAS_CLASS) |
836 | return eo_e; | 836 | return eo_e; |
837 | else if (klass == EFL_LOOP_CLASS) | 837 | else if (klass == EFL_LOOP_CLASS) |
838 | return ecore_main_loop_get(); | 838 | return efl_main_loop_get(); |
839 | else if (klass == EFL_GESTURE_MANAGER_CLASS) | 839 | else if (klass == EFL_GESTURE_MANAGER_CLASS) |
840 | return e->gesture_manager; | 840 | return e->gesture_manager; |
841 | return efl_provider_find(efl_super(eo_e, MY_CLASS), klass); | 841 | return efl_provider_find(efl_super(eo_e, MY_CLASS), klass); |
@@ -844,7 +844,7 @@ _evas_canvas_efl_object_provider_find(Eo *eo_e, Evas_Public_Data *e EINA_UNUSED, | |||
844 | EOLIAN static Efl_Loop * | 844 | EOLIAN static Efl_Loop * |
845 | _evas_canvas_efl_loop_consumer_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED) | 845 | _evas_canvas_efl_loop_consumer_loop_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e EINA_UNUSED) |
846 | { | 846 | { |
847 | return ecore_main_loop_get(); | 847 | return efl_main_loop_get(); |
848 | } | 848 | } |
849 | 849 | ||
850 | Ector_Surface * | 850 | Ector_Surface * |
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c index 2be420a409..8383997af0 100644 --- a/src/lib/evas/canvas/evas_object_main.c +++ b/src/lib/evas/canvas/evas_object_main.c | |||
@@ -2435,7 +2435,7 @@ _efl_canvas_object_efl_object_provider_find(Eo *eo_obj EINA_UNUSED, Evas_Object_ | |||
2435 | return obj->layer->evas->evas; | 2435 | return obj->layer->evas->evas; |
2436 | } | 2436 | } |
2437 | else if (klass == EFL_LOOP_CLASS) | 2437 | else if (klass == EFL_LOOP_CLASS) |
2438 | return ecore_main_loop_get(); | 2438 | return efl_main_loop_get(); |
2439 | fallback: | 2439 | fallback: |
2440 | return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass); | 2440 | return efl_provider_find(efl_super(eo_obj, MY_CLASS), klass); |
2441 | } | 2441 | } |
@@ -2443,7 +2443,7 @@ fallback: | |||
2443 | EOLIAN static Efl_Loop * | 2443 | EOLIAN static Efl_Loop * |
2444 | _efl_canvas_object_efl_loop_consumer_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) | 2444 | _efl_canvas_object_efl_loop_consumer_loop_get(Eo *eo_obj EINA_UNUSED, Evas_Object_Protected_Data *obj EINA_UNUSED) |
2445 | { | 2445 | { |
2446 | return ecore_main_loop_get(); | 2446 | return efl_main_loop_get(); |
2447 | } | 2447 | } |
2448 | 2448 | ||
2449 | EOLIAN Evas_Object* | 2449 | EOLIAN Evas_Object* |
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 3ba8c5349f..70c5618390 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c | |||
@@ -16215,7 +16215,7 @@ _dummy_cancel(void *data EINA_UNUSED, const Eina_Promise *dead EINA_UNUSED) | |||
16215 | static Eina_Future_Scheduler * | 16215 | static Eina_Future_Scheduler * |
16216 | _future_scheduler_get(void) | 16216 | _future_scheduler_get(void) |
16217 | { | 16217 | { |
16218 | return efl_loop_future_scheduler_get(ecore_main_loop_get()); | 16218 | return efl_loop_future_scheduler_get(efl_main_loop_get()); |
16219 | } | 16219 | } |
16220 | 16220 | ||
16221 | EOLIAN static Eina_Future * | 16221 | EOLIAN static Eina_Future * |