summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-09 16:27:01 +0000
committerTom Hacohen <tom@stosb.com>2016-03-09 16:27:01 +0000
commitde897d633f58b81a3b73c0af3ff3c586fdeb8056 (patch)
treea3626a2a3639efa164a604914a4d1cde91bd7891
parentd1a1819813d74361b25fd5c1123f7ac76be9b84f (diff)
Image test: Migrate to the new event cb signature.
-rw-r--r--src/tests/elm_test_image.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/tests/elm_test_image.c b/src/tests/elm_test_image.c
index fcc728c8f..ef631c7d2 100644
--- a/src/tests/elm_test_image.c
+++ b/src/tests/elm_test_image.c
@@ -35,28 +35,24 @@ START_TEST (elm_atspi_role_get)
35END_TEST 35END_TEST
36 36
37static Eina_Bool 37static Eina_Bool
38_async_error_cb(void *data, Eo *obj, 38_async_error_cb(void *data, const Eo_Event *event)
39 const Eo_Event_Description *desc EINA_UNUSED,
40 void *event_info EINA_UNUSED)
41{ 39{
42 Test_Data *td = data; 40 Test_Data *td = data;
43 char path[PATH_MAX]; 41 char path[PATH_MAX];
44 sprintf(path, pathfmt, td->image_id); 42 sprintf(path, pathfmt, td->image_id);
45 efl_file_set(obj, path, NULL); 43 efl_file_set(event->obj, path, NULL);
46 return EO_CALLBACK_CONTINUE; 44 return EO_CALLBACK_CONTINUE;
47} 45}
48 46
49static Eina_Bool 47static Eina_Bool
50_async_opened_cb(void *data, Eo *obj, 48_async_opened_cb(void *data, const Eo_Event *event)
51 const Eo_Event_Description *desc EINA_UNUSED,
52 void *event_info EINA_UNUSED)
53{ 49{
54 Test_Data *td = data; 50 Test_Data *td = data;
55 const char *ff, *kk, *r1, *r2; 51 const char *ff, *kk, *r1, *r2;
56 char path[PATH_MAX]; 52 char path[PATH_MAX];
57 53
58 sprintf(path, pathfmt, td->image_id); 54 sprintf(path, pathfmt, td->image_id);
59 efl_file_get(obj, &ff, &kk); 55 efl_file_get(event->obj, &ff, &kk);
60 r1 = strrchr(ff, '/'); 56 r1 = strrchr(ff, '/');
61 r2 = strrchr(path, '/'); 57 r2 = strrchr(path, '/');
62 ck_assert(!strcmp(r1, r2)); 58 ck_assert(!strcmp(r1, r2));
@@ -66,7 +62,7 @@ _async_opened_cb(void *data, Eo *obj,
66 { 62 {
67 td->image_id++; 63 td->image_id++;
68 sprintf(path, pathfmt, td->image_id); 64 sprintf(path, pathfmt, td->image_id);
69 efl_file_set(obj, path, NULL); 65 efl_file_set(event->obj, path, NULL);
70 return EO_CALLBACK_CONTINUE; 66 return EO_CALLBACK_CONTINUE;
71 } 67 }
72 else if (td->image_id < MAX_IMAGE_ID) 68 else if (td->image_id < MAX_IMAGE_ID)
@@ -75,7 +71,7 @@ _async_opened_cb(void *data, Eo *obj,
75 for (; td->image_id < MAX_IMAGE_ID;) 71 for (; td->image_id < MAX_IMAGE_ID;)
76 { 72 {
77 sprintf(path, pathfmt, ++td->image_id); 73 sprintf(path, pathfmt, ++td->image_id);
78 efl_file_set(obj, path, NULL); 74 efl_file_set(event->obj, path, NULL);
79 } 75 }
80 return EO_CALLBACK_CONTINUE; 76 return EO_CALLBACK_CONTINUE;
81 } 77 }