From: tasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Wed, 13 Apr 2011 10:22:55 +0000 (+0000)
Subject: Evas textblock: Fixed a wrong test for end of string.
X-Git-Tag: 2.0_alpha~240^2~822
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d1d374d5c1b9bda0f609d4d31e861456f3022651;p=framework%2Fuifw%2Fevas.git

Evas textblock: Fixed a wrong test for end of string.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@58624 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 406eedb..956472f 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -3067,7 +3067,6 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
    int orig_wrap;
    Eina_Unicode ch;
    const Eina_Unicode *str = GET_ITEM_TEXT(ti);
-   /* FIXME-tom: a lot of str[] to check if NULL, need to fix that. */
 
    wrap = _layout_text_cutoff_get(c, fmt, ti);
    /* Avoiding too small textblocks to even contain one char */
@@ -3101,7 +3100,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
                     {
                        wrap = twrap;
                        ch = GET_PREV(str, wrap);
-                       return (str[wrap]) ? wrap : -1;
+                       return (!IS_AT_END(ti, wrap)) ? wrap : -1;
                     }
                }
           }