From c950931132d3d91e066a71b51eaf605822682a8d Mon Sep 17 00:00:00 2001 From: caro Date: Tue, 14 Dec 2010 05:42:25 +0000 Subject: [PATCH] declare variables at the beginning of the block git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@55545 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/edje_box_layout.c | 4 +++- src/lib/edje_entry.c | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lib/edje_box_layout.c b/src/lib/edje_box_layout.c index 5a30c1d..3585046 100644 --- a/src/lib/edje_box_layout.c +++ b/src/lib/edje_box_layout.c @@ -79,8 +79,10 @@ _edje_box_layout_exec(Evas_Object *obj, Edje_Part_Box_Animation *anim) Edje_Transition_Animation_Data *tad; Evas_Coord x, y, w, h; Evas_Coord cur_x, cur_y, cur_w, cur_h; + double progress; + evas_object_geometry_get(obj, &x, &y, &w, &h); - double progress = (anim->progress - anim->start_progress) / (1 - anim->start_progress); + progress = (anim->progress - anim->start_progress) / (1 - anim->start_progress); EINA_LIST_FOREACH(anim->objs, l, tad) { diff --git a/src/lib/edje_entry.c b/src/lib/edje_entry.c index 6dd2d1a..a44c91a 100644 --- a/src/lib/edje_entry.c +++ b/src/lib/edje_entry.c @@ -2457,9 +2457,12 @@ void _edje_entry_cursor_copy(Edje_Real_Part *rp, Edje_Cursor cur, Edje_Cursor dst) { Entry *en = rp->entry_data; - Evas_Textblock_Cursor *c = _cursor_get(rp, cur); + Evas_Textblock_Cursor *c; + Evas_Textblock_Cursor *d; + + c = _cursor_get(rp, cur); if (!c) return; - Evas_Textblock_Cursor *d = _cursor_get(rp, dst); + d = _cursor_get(rp, dst); if (!d) return; evas_textblock_cursor_copy(c, d); _curs_update_from_curs(c, rp->object, rp->entry_data); -- 2.7.4