summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2019-02-06 13:08:19 -0500
committerMike Blumenkrantz <zmike@samsung.com>2019-02-06 13:08:19 -0500
commit917e0aa0feb9a79721953ea632723d26a251a850 (patch)
tree077bd2a34c994ec0e96fa9ff59c17bfb17fb5598 /src/lib/edje
parentc62bac00cb7fe8634aee4da33729af8ef372e092 (diff)
edje: make legacy edje call rely directly on edje internal.
Reviewers: zmike, q66, segfaultxavi, bu5hm4n Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T7671 Differential Revision: https://phab.enlightenment.org/D7869
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_legacy.c6
-rw-r--r--src/lib/edje/edje_private.h1
-rw-r--r--src/lib/edje/edje_program.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/src/lib/edje/edje_legacy.c b/src/lib/edje/edje_legacy.c
index 34299e1e18..e96e470724 100644
--- a/src/lib/edje/edje_legacy.c
+++ b/src/lib/edje/edje_legacy.c
@@ -77,7 +77,11 @@ edje_object_message_signal_recursive_process(Edje_Object *obj)
77EAPI void 77EAPI void
78edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data) 78edje_object_signal_callback_add(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data)
79{ 79{
80 efl_layout_signal_callback_add(obj, emission, source, (Efl_Signal_Cb) func, data); 80 Edje *ed;
81
82 ed = _edje_fetch(obj);
83 if (!ed || ed->delete_me) return;
84 _edje_object_signal_callback_add(ed, emission, source, func, data);
81} 85}
82 86
83EAPI void * 87EAPI void *
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 7c61d59bc1..a8349ae372 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -2425,6 +2425,7 @@ const Eina_Inarray *edje_match_signal_source_hash_get(const char *signal,
2425 const Eina_Rbtree *tree); 2425 const Eina_Rbtree *tree);
2426void edje_match_signal_source_free(Edje_Signal_Source_Char *key, void *data); 2426void edje_match_signal_source_free(Edje_Signal_Source_Char *key, void *data);
2427void _edje_signal_callback_matches_unref(Edje_Signal_Callback_Matches *m); 2427void _edje_signal_callback_matches_unref(Edje_Signal_Callback_Matches *m);
2428Eina_Bool _edje_object_signal_callback_add(Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data);
2428 2429
2429// FIXME remove below 3 eapi decls when edje_convert goes 2430// FIXME remove below 3 eapi decls when edje_convert goes
2430EAPI void _edje_edd_init(void); 2431EAPI void _edje_edd_init(void);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 38a798f2ad..e6a1373adf 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -236,7 +236,7 @@ edje_transition_duration_factor_set(double scale)
236 _edje_transition_duration_scale = FROM_DOUBLE(scale); 236 _edje_transition_duration_scale = FROM_DOUBLE(scale);
237} 237}
238 238
239static inline Eina_Bool 239Eina_Bool
240_edje_object_signal_callback_add(Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data) 240_edje_object_signal_callback_add(Edje *ed, const char *emission, const char *source, Efl_Signal_Cb func, void *data)
241{ 241{
242 Edje_Signal_Callback_Group *gp; 242 Edje_Signal_Callback_Group *gp;