summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-04-18 11:17:03 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-01 10:39:01 -0700
commitb30587f5b03f7acb8554b7e32fe94858e6566e0b (patch)
tree4ed3e665e74af52420928e267250f3562d1b6e23 /src
parent8bad7028aefef4abd5e8260b54153f4788d2519e (diff)
eo: linking a future lifecycle with an object lifecycle doesn't change the object.
Diffstat (limited to 'src')
-rw-r--r--src/lib/eo/Eo.h2
-rw-r--r--src/lib/eo/eo_base_class.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index e7ec0a761a..908e3fbb65 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -538,7 +538,7 @@ typedef struct _Efl_Future_Cb_Desc {
538 * @see #Efl_Future_Cb_Desc 538 * @see #Efl_Future_Cb_Desc
539 * @see efl_key_data_set() 539 * @see efl_key_data_set()
540 */ 540 */
541EOAPI Eina_Future_Desc efl_future_cb_from_desc(Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1); 541EOAPI Eina_Future_Desc efl_future_cb_from_desc(const Eo *obj, const Efl_Future_Cb_Desc desc) EINA_ARG_NONNULL(1);
542 542
543/** 543/**
544 * Syntax suger over efl_future_cb_from_desc() 544 * Syntax suger over efl_future_cb_from_desc()
diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c
index a3d62c079f..453fb6a0de 100644
--- a/src/lib/eo/eo_base_class.c
+++ b/src/lib/eo/eo_base_class.c
@@ -87,7 +87,7 @@ typedef struct
87typedef struct _Efl_Future_Pending 87typedef struct _Efl_Future_Pending
88{ 88{
89 EINA_INLIST; 89 EINA_INLIST;
90 Eo *o; 90 const Eo *o;
91 Eina_Future *future; 91 Eina_Future *future;
92 Efl_Future_Cb_Desc desc; 92 Efl_Future_Cb_Desc desc;
93} Efl_Future_Pending; 93} Efl_Future_Pending;
@@ -1977,7 +1977,7 @@ _efl_future_cb(void *data, const Eina_Value value, const Eina_Future *dead_futur
1977{ 1977{
1978 Efl_Future_Pending *pending = data; 1978 Efl_Future_Pending *pending = data;
1979 Eina_Value ret = value; 1979 Eina_Value ret = value;
1980 Eo *o; 1980 const Eo *o;
1981 Efl_Object_Data *pd; 1981 Efl_Object_Data *pd;
1982 1982
1983 EINA_SAFETY_ON_NULL_GOTO(pending, err); 1983 EINA_SAFETY_ON_NULL_GOTO(pending, err);
@@ -1988,7 +1988,7 @@ _efl_future_cb(void *data, const Eina_Value value, const Eina_Future *dead_futur
1988 pd->pending_futures = eina_inlist_remove(pd->pending_futures, 1988 pd->pending_futures = eina_inlist_remove(pd->pending_futures,
1989 EINA_INLIST_GET(pending)); 1989 EINA_INLIST_GET(pending));
1990 efl_ref(o); 1990 efl_ref(o);
1991 EASY_FUTURE_DISPATCH(ret, value, dead_future, &pending->desc, o); 1991 EASY_FUTURE_DISPATCH(ret, value, dead_future, &pending->desc, (void*) o);
1992 efl_unref(o); 1992 efl_unref(o);
1993 _efl_pending_future_free(pending); 1993 _efl_pending_future_free(pending);
1994 1994
@@ -2001,7 +2001,7 @@ _efl_future_cb(void *data, const Eina_Value value, const Eina_Future *dead_futur
2001} 2001}
2002 2002
2003EOAPI Eina_Future_Desc 2003EOAPI Eina_Future_Desc
2004efl_future_cb_from_desc(Eo *o, const Efl_Future_Cb_Desc desc) 2004efl_future_cb_from_desc(const Eo *o, const Efl_Future_Cb_Desc desc)
2005{ 2005{
2006 Efl_Future_Pending *pending = NULL; 2006 Efl_Future_Pending *pending = NULL;
2007 Eina_Future **storage = NULL; 2007 Eina_Future **storage = NULL;