enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

Eobj: Revert "Eobj: Only try composite objects when really supposed to." 

Was stupid and plain wrong.

This reverts commit 70132.

SVN revision: 70133
This commit is contained in:
Tom Hacohen 2012-04-12 10:23:46 +00:00
parent c92e62b5eb
commit a0ee8a4aa7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
legacy/eobj/lib/eobj.c
View File

@ -319,7 +319,7 @@ _eobj_op_id_desc_get(Eobj_Op op)
} }
static Eina_Bool static Eina_Bool
_eobj_op_internal(Eobj *obj, Eobj_Op op, va_list *p_list, Eina_Bool try_comp) _eobj_op_internal(Eobj *obj, Eobj_Op op, va_list *p_list)
{ {
const Eobj_Class *klass; const Eobj_Class *klass;
Eina_Bool ret = EINA_FALSE; Eina_Bool ret = EINA_FALSE;
@ -341,14 +341,13 @@ _eobj_op_internal(Eobj *obj, Eobj_Op op, va_list *p_list, Eina_Bool try_comp)
klass = _eobj_kls_itr_next(obj); klass = _eobj_kls_itr_next(obj);
} }
/* Try composite objects only if it was requested. */ /* Try composite objects */
if (try_comp)
{ {
Eina_List *itr; Eina_List *itr;
Eobj *emb_obj; Eobj *emb_obj;
EINA_LIST_FOREACH(obj->composite_objects, itr, emb_obj) EINA_LIST_FOREACH(obj->composite_objects, itr, emb_obj)
{ {
if (_eobj_op_internal(emb_obj, op, p_list, EINA_TRUE)) if (_eobj_op_internal(emb_obj, op, p_list))
{ {
ret = EINA_TRUE; ret = EINA_TRUE;
goto end; goto end;
@ -371,7 +370,7 @@ _eobj_ops_internal(Eobj *obj, va_list *p_list)
op = va_arg(*p_list, Eobj_Op); op = va_arg(*p_list, Eobj_Op);
while (op) while (op)
{ {
if (!_eobj_op_internal(obj, op, p_list, EINA_TRUE)) if (!_eobj_op_internal(obj, op, p_list))
{ {
const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op); const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
const char *_id_name = (desc) ? desc->name : NULL; const char *_id_name = (desc) ? desc->name : NULL;
@ -411,7 +410,7 @@ eobj_super_do(Eobj *obj, Eobj_Op op, ...)
/* Advance the kls itr. */ /* Advance the kls itr. */
obj_klass = _eobj_kls_itr_next(obj); obj_klass = _eobj_kls_itr_next(obj);
if (!_eobj_op_internal(obj, op, &p_list, EINA_FALSE)) if (!_eobj_op_internal(obj, op, &p_list))
{ {
const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op); const Eobj_Op_Description *desc = _eobj_op_id_desc_get(op);
const char *_id_name = (desc) ? desc->name : NULL; const char *_id_name = (desc) ? desc->name : NULL;