Eobj: Composite objects should be attempted last.
authortasn <tasn>
Thu, 12 Apr 2012 10:14:58 +0000 (10:14 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Thu, 12 Apr 2012 10:14:58 +0000 (10:14 +0000)
git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@70131 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

lib/eobj.c

index a2aea4b..17f29c0 100644 (file)
@@ -337,22 +337,22 @@ _eobj_op_internal(Eobj *obj, Eobj_Op op, va_list *p_list)
              ret = EINA_TRUE;
              goto end;
           }
-        else
+
+        klass = _eobj_kls_itr_next(obj);
+     }
+
+   /* Try composite objects */
+     {
+        Eina_List *itr;
+        Eobj *emb_obj;
+        EINA_LIST_FOREACH(obj->composite_objects, itr, emb_obj)
           {
-             /* Try composite objects */
-             Eina_List *itr;
-             Eobj *emb_obj;
-             EINA_LIST_FOREACH(obj->composite_objects, itr, emb_obj)
+             if (_eobj_op_internal(emb_obj, op, p_list))
                {
-                  if (_eobj_op_internal(emb_obj, op, p_list))
-                    {
-                       ret = EINA_TRUE;
-                       goto end;
-                    }
+                  ret = EINA_TRUE;
+                  goto end;
                }
           }
-
-        klass = _eobj_kls_itr_next(obj);
      }
 
 end: