summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-07 21:34:20 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-07 21:34:20 +0000
commitb59fba7d69aef33f026f1eab6f83a84a5e350f1d (patch)
tree66e9658c1d2f8104159b369832612688666b6c21 /src
parent42ed4a0db1884c5e0ef4f977db0d256a9bfac1da (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/edje/edje_calc.c6
1 files 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
2823 2823
2824 if (ep->part->type == EDJE_PART_TYPE_PROXY) 2824 if (ep->part->type == EDJE_PART_TYPE_PROXY)
2825 { 2825 {
2826 Edje_Real_Part *pp;
2827 int part_id = -1; 2826 int part_id = -1;
2828 2827
2829 if (pos >= FROM_DOUBLE(0.5)) 2828 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
2831 else 2830 else
2832 part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id; 2831 part_id = ((Edje_Part_Description_Proxy*) chosen_desc)->proxy.id;
2833 2832
2834 pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL);
2835#ifdef EDJE_CALC_CACHE 2833#ifdef EDJE_CALC_CACHE
2834 Edje_Real_Part *pp;
2835 pp = _edje_real_part_state_get(ed, ep, flags, part_id, NULL);
2836 if (pp && pp->invalidate) proxy_invalidate = EINA_TRUE; 2836 if (pp && pp->invalidate) proxy_invalidate = EINA_TRUE;
2837#else
2838 _edje_real_part_state_get(ed, ep, flags, part_id, NULL);
2837#endif 2839#endif
2838 } 2840 }
2839 2841