From f0a2a3229d2bb0fc2da84a6fb114c8ee81408bbb Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Sun, 30 Jan 2011 10:41:49 +0000 Subject: [PATCH] Evas textblock: Fixed a seg and the documentation error that caused it. SVN revision: 56505 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index de509424cc..8f2ced55e3 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -2728,7 +2728,7 @@ skip: * * @param c the current context- NOT NULL. * @param n the source format node - not null. - * @param item the format text - not null. + * @param item the format text. * * @return the new format item. */ @@ -3164,7 +3164,7 @@ _layout_visualize_par(Ctxt *c) Evas_Object_Textblock_Format_Item *fi; fi = _ITEM_FORMAT(it); fi->y = c->y; - if (_IS_LINE_SEPARATOR(fi->item)) + if (fi->item && _IS_LINE_SEPARATOR(fi->item)) { adv_line = 1; } @@ -3388,8 +3388,6 @@ _layout(const Evas_Object *obj, int calc_only, int w, int h, int *w_ret, int *h_ _layout(obj, calc_only, w, h, w_ret, h_ret); return; } - - return; } /*