From: tasn Date: Wed, 1 Sep 2010 14:26:55 +0000 (+0000) Subject: Evas textblock: Fixed compilation without fribidi. <-- For real now. :P X-Git-Tag: 2.0_alpha~240^2~1568 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d3904bf2f3366759f7390c82248d2478a9c12444;p=framework%2Fuifw%2Fevas.git Evas textblock: Fixed compilation without fribidi. <-- For real now. :P git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@51809 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c index 7ed6782..ff7e94b 100644 --- a/src/lib/canvas/evas_object_text.c +++ b/src/lib/canvas/evas_object_text.c @@ -1457,7 +1457,9 @@ evas_object_text_new(void) o = calloc(1, sizeof(Evas_Object_Text)); o->magic = MAGIC_OBJ_TEXT; o->prev = o->cur; +#ifdef BIDI_SUPPORT o->cur.intl_props.props = evas_bidi_paragraph_props_new(); +#endif return o; } @@ -1477,7 +1479,9 @@ evas_object_text_free(Evas_Object *obj) if (o->cur.font) eina_stringshare_del(o->cur.font); if (o->cur.source) eina_stringshare_del(o->cur.source); if (o->engine_data) evas_font_free(obj->layer->evas, o->engine_data); +#ifdef BIDI_SUPPORT evas_bidi_props_clean(&o->cur.intl_props); +#endif o->magic = 0; free(o); } diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index c6911ef..fd56002 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -5498,8 +5498,10 @@ _evas_textblock_node_text_free(Evas_Object_Textblock_Node_Text *n) eina_ustrbuf_free(n->unicode); if (n->utf8) free(n->utf8); +#ifdef BIDI_SUPPORT if (&n->bidi_props) evas_bidi_paragraph_props_unref(n->bidi_props); +#endif free(n); }