From f247b0d480141475c35677d95e2654acc237042a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:45:51 +0000 Subject: [PATCH] Evas textblock: Did a bit of code clean-up. SVN revision: 56543 --- .../src/lib/canvas/evas_object_textblock.c | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index 3b7cb60afe..114da05f43 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -4020,18 +4020,14 @@ evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts) TB_HEAD(); if (ts == o->style) return; if ((ts) && (ts->delete_me)) return; - if (o->markup_text) - { - if (o->style) - { - free(o->markup_text); - o->markup_text = NULL; - evas_object_textblock_text_markup_get(obj); - } - } if (o->style) { Evas_Textblock_Style *old_ts; + if (o->markup_text) + { + free(o->markup_text); + o->markup_text = NULL; + } old_ts = o->style; old_ts->objects = eina_list_remove(old_ts->objects, obj); @@ -4041,12 +4037,8 @@ evas_object_textblock_style_set(Evas_Object *obj, Evas_Textblock_Style *ts) if (ts) { ts->objects = eina_list_append(ts->objects, obj); - o->style = ts; - } - else - { - o->style = NULL; } + o->style = ts; _evas_textblock_text_node_changed(o, obj, NULL); }