[EGIT] [core/efl] efl-1.17 02/02: Edje textblock: Assume textblock knows to deal with setting the same markup.

[Tom Hacohen]

tasn pushed a commit to branch efl-1.17.

http://git.enlightenment.org/core/efl.git/commit/?id=8d9a883f3a953b42920cf289d2d7346a2c7dac2a

commit 8d9a883f3a953b42920cf289d2d7346a2c7dac2a
Author: Tom Hacohen <t...@stosb.com>
Date:   Fri Feb 26 09:07:20 2016 +0000

    Edje textblock: Assume textblock knows to deal with setting the same markup.
    
    Edje was trying to be smart and ask textblock for its markup and compare
    with its own cache before setting it again. This is completely wrong,
    and textblock is smart enough to deal with it now.
    
    @fix
---
 src/lib/edje/edje_calc.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 1704670..4a60ef4 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -1564,8 +1564,6 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
 
         if (stl)
           {
-             const char *ptxt;
-
              if (evas_object_textblock_style_get(ep->object) != stl->style)
                evas_object_textblock_style_set(ep->object, stl->style);
              // FIXME: need to account for editing
@@ -1575,11 +1573,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
                }
              else
                {
-                  ptxt = evas_object_textblock_text_markup_get(ep->object);
-                  if (((!ptxt) && (text)) ||
-                      ((ptxt) && (text) && (strcmp(ptxt, text))) ||
-                      ((ptxt) && (!text)))
-                    evas_object_textblock_text_markup_set(ep->object, text);
+                  evas_object_textblock_text_markup_set(ep->object, text);
                }
              if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y))
                {

--