From b59fba7d69aef33f026f1eab6f83a84a5e350f1d Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Mon, 7 Jan 2013 21:34:20 +0000 Subject: [PATCH] efl/edje: remove warning (PLEASE REVIEW). This warning was removed but I left the _edje_real_part_state_get() in there as this will not just get the part state, but also call _edje_part_recalc() if needed. Should we completely remove the block, or is _edje_part_recalc() required? SVN revision: 82366 --- src/lib/edje/edje_calc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index a0ecb6f664..9422d4e446 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -2823,7 +2823,6 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta if (ep->part->type == EDJE_PART_TYPE_PROXY) { - Edje_Real_Part *pp; int part_id = -1; if (pos >= FROM_DOUBLE(0.5)) @@ -2831,9 +2830,12 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta else part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id; - pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL); #ifdef EDJE_CALC_CACHE + Edje_Real_Part *pp; + pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL); if (pp && pp->invalidate) proxy_invalidate = EINA_TRUE; +#else + _edje_real_part_state_get(ed, ep, flags, part_id, NULL); #endif }