From: Enlightenment S. <no-...@en...> - 2008-10-19 23:59:02
|
Log: 1. fix no propagate 2. fix segv in textblock. Author: raster Date: 2008-10-19 16:58:56 -0700 (Sun, 19 Oct 2008) New Revision: 36828 Modified: trunk/evas/src/lib/canvas/evas_callbacks.c trunk/evas/src/lib/canvas/evas_object_textblock.c Modified: trunk/evas/src/lib/canvas/evas_callbacks.c =================================================================== --- trunk/evas/src/lib/canvas/evas_callbacks.c 2008-10-19 23:46:07 UTC (rev 36827) +++ trunk/evas/src/lib/canvas/evas_callbacks.c 2008-10-19 23:58:56 UTC (rev 36828) @@ -143,9 +143,12 @@ if (!((obj->no_propagate) && (l_mod) && (*l_mod))) { - if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && - (type <= EVAS_CALLBACK_KEY_UP)) - evas_object_event_callback_call(obj->smart.parent, type, event_info); + if (!obj->no_propagate) + { + if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) && + (type <= EVAS_CALLBACK_KEY_UP)) + evas_object_event_callback_call(obj->smart.parent, type, event_info); + } } _evas_unwalk(e); } Modified: trunk/evas/src/lib/canvas/evas_object_textblock.c =================================================================== --- trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-10-19 23:46:07 UTC (rev 36827) +++ trunk/evas/src/lib/canvas/evas_object_textblock.c 2008-10-19 23:58:56 UTC (rev 36828) @@ -2493,7 +2493,16 @@ obj = l->data; o = (Evas_Object_Textblock *)(obj->object_data); if (o->markup_text) - evas_object_textblock_text_markup_set(obj, o->markup_text); + { + char *m; + + m = strdup(o->markup_text); + if (m) + { + evas_object_textblock_text_markup_set(obj, m); + free(m); + } + } } } |