eo: fix composite to actually work.

So I don't really understand why the code was not there before, but it resulted
in my experiment of making a combobox for elementary just impossible. Now it
work at least.
This commit is contained in:
Cedric BAIL 2014-10-27 23:23:45 +01:00
parent 0e736ee624
commit 3550c38080
1 changed files with 6 additions and 4 deletions

View File

@ -589,6 +589,9 @@ EAPI Eina_Bool
else
{
func = _dich_func_get(klass, op);
if (!func)
goto end;
}
if (EINA_UNLIKELY(func == NULL))
@ -641,10 +644,10 @@ end:
Eo *emb_obj_id;
EINA_LIST_FOREACH(((_Eo_Object *) fptr->o.obj)->composite_objects, itr, emb_obj_id)
{
_Eo_Object *emb_obj = _eo_obj_pointer_get((Eo_Id)emb_obj_id);
_Eo_Object *emb_obj = _eo_obj_pointer_get((Eo_Id)emb_obj_id);
if (!emb_obj)
goto end2;
if (!emb_obj)
continue;
func = _dich_func_get(emb_obj->klass, op);
if (func == NULL)
@ -662,7 +665,6 @@ end:
}
}
end2:
{
const _Eo_Class *main_klass;
main_klass = (is_obj) ? fptr->o.obj->klass : fptr->o.kls;