summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_entry.c
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-02-06 13:48:43 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-06 13:48:43 -0500
commitf484ca0951e4875f926ebbd9f779d38a13659577 (patch)
treee67dfc2db88b882e6e904d4ac6219c9549472cb7 /src/lib/elementary/elm_entry.c
parent917e0aa0feb9a79721953ea632723d26a251a850 (diff)
edje: migrate Eo API to use Eo callback instead of opaque type.
Summary: Depends on D7869 Reviewers: zmike, q66, segfaultxavi, bu5hm4n Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7671 Differential Revision: https://phab.enlightenment.org/D7870
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/elm_entry.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 8661778d09..c811e16cb4 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -3140,26 +3140,30 @@ _elm_entry_efl_layout_signal_signal_emit(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd
3140 } 3140 }
3141} 3141}
3142 3142
3143EOLIAN static Eina_Bool 3143static Eina_Bool
3144_elm_entry_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) 3144_elm_entry_efl_layout_signal_signal_callback_add(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd,
3145 const char *emission, const char *source,
3146 void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb)
3145{ 3147{
3146 Eina_Bool ok; 3148 Eina_Bool ok;
3147 3149
3148 ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_cb, data); 3150 ok = efl_layout_signal_callback_add(sd->entry_edje, emission, source, func_data, func, func_free_cb);
3149 if (sd->scr_edje) 3151 if (sd->scr_edje)
3150 ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); 3152 ok = efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_data, func, func_free_cb);
3151 3153
3152 return ok; 3154 return ok;
3153} 3155}
3154 3156
3155EOLIAN static Eina_Bool 3157static Eina_Bool
3156_elm_entry_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char *emission, const char *source, Edje_Signal_Cb func_cb, void *data) 3158_elm_entry_efl_layout_signal_signal_callback_del(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd,
3159 const char *emission, const char *source,
3160 void *func_data, EflLayoutSignalCb func, Eina_Free_Cb func_free_cb)
3157{ 3161{
3158 Eina_Bool ok; 3162 Eina_Bool ok;
3159 3163
3160 ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_cb, data); 3164 ok = efl_layout_signal_callback_del(sd->entry_edje, emission, source, func_data, func, func_free_cb);
3161 if (sd->scr_edje) 3165 if (sd->scr_edje)
3162 ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); 3166 ok = efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_data, func, func_free_cb);
3163 3167
3164 return ok; 3168 return ok;
3165} 3169}
@@ -3177,7 +3181,7 @@ _elm_entry_signal_callback_add_legacy(Eo *obj, const char *emission, const char
3177 emission, source, func_cb, data); 3181 emission, source, func_cb, data);
3178 3182
3179 if (sd->scr_edje) 3183 if (sd->scr_edje)
3180 efl_layout_signal_callback_add(sd->scr_edje, emission, source, func_cb, data); 3184 efl_layout_signal_callback_add(sd->scr_edje, emission, source, data, func_cb, NULL);
3181} 3185}
3182 3186
3183void * 3187void *
@@ -3193,7 +3197,7 @@ _elm_entry_signal_callback_del_legacy(Eo *obj, const char *emission, const char
3193 emission, source, func_cb); 3197 emission, source, func_cb);
3194 3198
3195 if (sd->scr_edje) 3199 if (sd->scr_edje)
3196 efl_layout_signal_callback_del(sd->scr_edje, emission, source, func_cb, data); 3200 efl_layout_signal_callback_del(sd->scr_edje, emission, source, data, func_cb, NULL);
3197 3201
3198 return data; 3202 return data;
3199} 3203}