enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

1. fix no propagate 

2. fix segv in textblock.



SVN revision: 36828
This commit is contained in:
Carsten Haitzler 2008-10-19 23:58:56 +00:00
parent c602dde40b
commit f053582e31
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
legacy/evas/src/lib/canvas/evas_callbacks.c
View File

@ -143,9 +143,12 @@ evas_object_event_callback_call(Evas_Object *obj, Evas_Callback_Type type, void
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);
}

11
legacy/evas/src/lib/canvas/evas_object_textblock.c
View File

@ -2493,7 +2493,16 @@ evas_textblock_style_set(Evas_Textblock_Style *ts, const char *text)
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);
}
}
}
}