summaryrefslogtreecommitdiff
path: root/src/tests/eo/suite
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousasilva@gmail.com>2016-08-22 19:40:39 -0300
committerVitor Sousa <vitorsousasilva@gmail.com>2016-08-26 15:45:07 -0300
commit8356b16a49d4f653d61940763eff947466b44e24 (patch)
treeb5d8e533b3df4ad45f2ea97071b7a826ae5d04b5 /src/tests/eo/suite
parent6b3ca899e8a60642466ddb6d7c7574b0c3ad9d9c (diff)
Efl Object: remove legacy callback calls from event_callback_call
Efl.Object.event_callback_call no longer calls legacy smart callbacks; calling only event callbacks registered with the given event description pointer. Create the method Efl.Object.event_callback_legacy_call to inherit the old behavior from Efl.Object.event_callback_call, calling both Efl.Object events and legacy smart callbacks. Update all other files accordingly in order to still supply legacy callbacks while they are necessary.
Diffstat (limited to 'src/tests/eo/suite')
-rw-r--r--src/tests/eo/suite/eo_test_class_simple.c2
-rw-r--r--src/tests/eo/suite/eo_test_general.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/eo/suite/eo_test_class_simple.c b/src/tests/eo/suite/eo_test_class_simple.c
index a68d643fb0..6bbeda587e 100644
--- a/src/tests/eo/suite/eo_test_class_simple.c
+++ b/src/tests/eo/suite/eo_test_class_simple.c
@@ -20,7 +20,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
20 printf("%s %d\n", efl_class_name_get(MY_CLASS), a); 20 printf("%s %d\n", efl_class_name_get(MY_CLASS), a);
21 pd->a = a; 21 pd->a = a;
22 22
23 efl_event_callback_call(obj, EV_A_CHANGED, &pd->a); 23 efl_event_callback_legacy_call(obj, EV_A_CHANGED, &pd->a);
24} 24}
25 25
26static int 26static int
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index fd16ddbdf0..d6ab99ea55 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -139,7 +139,7 @@ static void
139_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event) 139_eo_signals_a_changed_within_cb(void *_data EINA_UNUSED, const Eo_Event *event)
140{ 140{
141 int a = 3; 141 int a = 3;
142 efl_event_callback_call(event->object, EV_A_CHANGED, &a); 142 efl_event_callback_legacy_call(event->object, EV_A_CHANGED, &a);
143 _eo_signals_cb_flag = 0x8; 143 _eo_signals_cb_flag = 0x8;
144} 144}
145 145
@@ -242,13 +242,13 @@ START_TEST(eo_signals)
242 int a = 3; 242 int a = 3;
243 _eo_signals_cb_current = 0; 243 _eo_signals_cb_current = 0;
244 _eo_signals_cb_flag = 0; 244 _eo_signals_cb_flag = 0;
245 efl_event_callback_call(obj, a_desc, &a); 245 efl_event_callback_legacy_call(obj, a_desc, &a);
246 ck_assert_int_eq(_eo_signals_cb_flag, 0x3); 246 ck_assert_int_eq(_eo_signals_cb_flag, 0x3);
247 247
248 /* Stop event within event. */ 248 /* Stop event within event. */
249 _eo_signals_cb_current = 0; 249 _eo_signals_cb_current = 0;
250 _eo_signals_cb_flag = 0; 250 _eo_signals_cb_flag = 0;
251 fail_if(!efl_event_callback_call(obj, EV_A_CHANGED2, &a)); 251 fail_if(!efl_event_callback_legacy_call(obj, EV_A_CHANGED2, &a));
252 ck_assert_int_eq(_eo_signals_cb_flag, 0x8); 252 ck_assert_int_eq(_eo_signals_cb_flag, 0x8);
253 fail_if(!r); 253 fail_if(!r);
254 } 254 }