From 185832f2da39553df4ad52724bff62dcf068577a Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 20 Jan 2012 02:57:02 +0000 Subject: [PATCH] fix style change inside callback reported by: Guilherme Silveira SVN revision: 67368 --- legacy/edje/ChangeLog | 6 ++++++ legacy/edje/src/lib/edje_load.c | 1 + 2 files changed, 7 insertions(+) diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog index ae65d85425..e61875a5dd 100644 --- a/legacy/edje/ChangeLog +++ b/legacy/edje/ChangeLog @@ -285,3 +285,9 @@ 2012-01-14 Carsten Haitzler (The Rasterman) * Added minmul propery for edje to multiply minimum size during min size calc + +2012-01-20 Carsten Haitzler (The Rasterman) + + * Fix the ability to change the edje file source of an edje object + inside a callback - it worked but you couldn't swallow/set text etc. + diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c index 8fe58424cf..47c3ba8591 100644 --- a/legacy/edje/src/lib/edje_load.c +++ b/legacy/edje/src/lib/edje_load.c @@ -294,6 +294,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g ed->load_error = EDJE_LOAD_ERROR_NONE; _edje_file_add(ed); + ed->block_break = 0; if (ed->file && ed->file->external_dir) {