summaryrefslogtreecommitdiff
path: root/src/lib/eo
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-04-26 14:25:37 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-04-26 16:19:06 +0200
commit67c7eb3134d33c84ba72bb5ba8da6e718a30f511 (patch)
tree9bf04e9396f5f1a03bca00370fb5efb3fa4011ee /src/lib/eo
parentf406bae8b73cf4069eb132254800af1340a50e9a (diff)
eo: move future_link to C
Diffstat (limited to 'src/lib/eo')
-rw-r--r--src/lib/eo/Eo.h9
-rw-r--r--src/lib/eo/efl_object.eo7
-rw-r--r--src/lib/eo/eo_base_class.c5
3 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index 259e1ac37c..60258a248e 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -342,6 +342,15 @@ EOAPI Eina_Bool efl_event_callback_call(Eo *obj, const Efl_Event_Description *de
342EOAPI Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info); 342EOAPI Eina_Bool efl_event_callback_legacy_call(Eo *obj, const Efl_Event_Description *desc, void *event_info);
343 343
344/** 344/**
345 * @brief Track a future life cycle and cancel it if the object dies.
346 *
347 * @param[in] link The future to link with the object
348 *
349 * @return @c true if it succeeded on setting up the tracking.
350 */
351EOAPI Eina_Bool efl_future_link(Eo *obj, Efl_Future *link);
352
353/**
345 * @addtogroup Eo_Debug_Information Eo's Debug information helper. 354 * @addtogroup Eo_Debug_Information Eo's Debug information helper.
346 * @{ 355 * @{
347 */ 356 */
diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 6d0aa97bd4..8daa6cd33f 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -343,13 +343,6 @@ abstract Efl.Object ()
343 ]] 343 ]]
344 return: bool; [[$true if it is. $false otherwise.]] 344 return: bool; [[$true if it is. $false otherwise.]]
345 } 345 }
346 future_link {
347 [[Track a future life cycle and cancel it if the object die]]
348 params {
349 @in link: future<void_ptr>; [[The future to link with the object]]
350 }
351 return: bool; [[$true if it succeeded on setting up the tracking.]]
352 }
353 } 346 }
354 implements { 347 implements {
355 class.constructor; 348 class.constructor;
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index aafa65590a..fa9efbc30e 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -1951,6 +1951,8 @@ _efl_object_future_link_tracking_end(void *data, const Efl_Event *ev)
1951 _efl_object_extension_noneed(pd); 1951 _efl_object_extension_noneed(pd);
1952} 1952}
1953 1953
1954EOAPI EFL_FUNC_BODYV(efl_future_link, Eina_Bool, 0, EFL_FUNC_CALL(link), Efl_Future *link);
1955
1954EOLIAN static Eina_Bool 1956EOLIAN static Eina_Bool
1955_efl_object_future_link(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, Efl_Future *link) 1957_efl_object_future_link(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, Efl_Future *link)
1956{ 1958{
@@ -1971,6 +1973,7 @@ _efl_object_future_link(Eo *obj EINA_UNUSED, Efl_Object_Data *pd, Efl_Future *li
1971 EFL_OBJECT_OP_FUNC(efl_event_callback_array_del, _efl_object_event_callback_array_del), \ 1973 EFL_OBJECT_OP_FUNC(efl_event_callback_array_del, _efl_object_event_callback_array_del), \
1972 EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_object_event_callback_call), \ 1974 EFL_OBJECT_OP_FUNC(efl_event_callback_call, _efl_object_event_callback_call), \
1973 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_object_event_callback_legacy_call), \ 1975 EFL_OBJECT_OP_FUNC(efl_event_callback_legacy_call, _efl_object_event_callback_legacy_call), \
1974 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_object_dbg_info_get) 1976 EFL_OBJECT_OP_FUNC(efl_dbg_info_get, _efl_object_dbg_info_get), \
1977 EFL_OBJECT_OP_FUNC(efl_future_link, _efl_object_future_link)
1975 1978
1976#include "efl_object.eo.c" 1979#include "efl_object.eo.c"