Image test: Migrate to the new event cb signature.

This commit is contained in:
Tom Hacohen 2016-03-09 16:27:01 +00:00
parent c788486398
commit 47fbd09ab2
1 changed files with 6 additions and 10 deletions

View File

@ -35,28 +35,24 @@ START_TEST (elm_atspi_role_get)
END_TEST END_TEST
static Eina_Bool static Eina_Bool
_async_error_cb(void *data, Eo *obj, _async_error_cb(void *data, const Eo_Event *event)
const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{ {
Test_Data *td = data; Test_Data *td = data;
char path[PATH_MAX]; char path[PATH_MAX];
sprintf(path, pathfmt, td->image_id); sprintf(path, pathfmt, td->image_id);
efl_file_set(obj, path, NULL); efl_file_set(event->obj, path, NULL);
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
} }
static Eina_Bool static Eina_Bool
_async_opened_cb(void *data, Eo *obj, _async_opened_cb(void *data, const Eo_Event *event)
const Eo_Event_Description *desc EINA_UNUSED,
void *event_info EINA_UNUSED)
{ {
Test_Data *td = data; Test_Data *td = data;
const char *ff, *kk, *r1, *r2; const char *ff, *kk, *r1, *r2;
char path[PATH_MAX]; char path[PATH_MAX];
sprintf(path, pathfmt, td->image_id); sprintf(path, pathfmt, td->image_id);
efl_file_get(obj, &ff, &kk); efl_file_get(event->obj, &ff, &kk);
r1 = strrchr(ff, '/'); r1 = strrchr(ff, '/');
r2 = strrchr(path, '/'); r2 = strrchr(path, '/');
ck_assert(!strcmp(r1, r2)); ck_assert(!strcmp(r1, r2));
@ -66,7 +62,7 @@ _async_opened_cb(void *data, Eo *obj,
{ {
td->image_id++; td->image_id++;
sprintf(path, pathfmt, td->image_id); sprintf(path, pathfmt, td->image_id);
efl_file_set(obj, path, NULL); efl_file_set(event->obj, path, NULL);
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
} }
else if (td->image_id < MAX_IMAGE_ID) else if (td->image_id < MAX_IMAGE_ID)
@ -75,7 +71,7 @@ _async_opened_cb(void *data, Eo *obj,
for (; td->image_id < MAX_IMAGE_ID;) for (; td->image_id < MAX_IMAGE_ID;)
{ {
sprintf(path, pathfmt, ++td->image_id); sprintf(path, pathfmt, ++td->image_id);
efl_file_set(obj, path, NULL); efl_file_set(event->obj, path, NULL);
} }
return EO_CALLBACK_CONTINUE; return EO_CALLBACK_CONTINUE;
} }