dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elementary/naviframe - refactored title_content_set 

fault here again!

it would missed one case.

step 1. actual content set
step 2. NULL content set

Since it did not remove content_pair structure even NULL object as a new one set,
the dangling structure could be happened.



SVN revision: 66274
This commit is contained in:
ChunEon Park 2011-12-16 09:07:41 +00:00
parent ba9d14d3ff
commit 6aefe2f7fe
1 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
legacy/elementary/src/lib/elc_naviframe.c
View File

@ -562,7 +562,26 @@ _title_content_set(Elm_Naviframe_Item *it,
EINA_INLIST_FOREACH(it->content_list, pair) EINA_INLIST_FOREACH(it->content_list, pair)
if (!strcmp(part, pair->part)) break; if (!strcmp(part, pair->part)) break;
if (!pair) if (part)
{
if (pair->content && (pair->content != content))
{
if (content)
{
evas_object_event_callback_del(pair->content,
EVAS_CALLBACK_DEL,
_title_content_del);
evas_object_event_callback_del(pair->content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints);
snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
edje_object_signal_emit(VIEW(it), buf, "elm");
}
evas_object_del(pair->content);
if (!content) return;
}
}
else
{ {
if (!content) return; if (!content) return;
pair = ELM_NEW(Elm_Naviframe_Content_Item_Pair); pair = ELM_NEW(Elm_Naviframe_Content_Item_Pair);
@ -575,38 +594,20 @@ _title_content_set(Elm_Naviframe_Item *it,
eina_stringshare_replace(&pair->part, part); eina_stringshare_replace(&pair->part, part);
it->content_list = eina_inlist_append(it->content_list, it->content_list = eina_inlist_append(it->content_list,
EINA_INLIST_GET(pair)); EINA_INLIST_GET(pair));
} elm_widget_sub_object_add(WIDGET(it), content);
if (pair->content && (pair->content != content)) evas_object_event_callback_add(content,
{
evas_object_event_callback_del(pair->content,
EVAS_CALLBACK_DEL, EVAS_CALLBACK_DEL,
_title_content_del); _title_content_del,
evas_object_event_callback_del(pair->content, pair);
evas_object_event_callback_add(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints); _changed_size_hints,
evas_object_del(pair->content); WIDGET(it));
snprintf(buf, sizeof(buf), "elm,state,%s,hide", part);
edje_object_signal_emit(VIEW(it), buf, "elm");
}
if (content)
{
if (pair->content != content)
{
elm_widget_sub_object_add(WIDGET(it), content);
evas_object_event_callback_add(content,
EVAS_CALLBACK_DEL,
_title_content_del,
pair);
evas_object_event_callback_add(content,
EVAS_CALLBACK_CHANGED_SIZE_HINTS,
_changed_size_hints,
WIDGET(it));
pair->content = content;
}
edje_object_part_swallow(VIEW(it), part, content);
snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
edje_object_signal_emit(VIEW(it), buf, "elm");
} }
edje_object_part_swallow(VIEW(it), part, content);
snprintf(buf, sizeof(buf), "elm,state,%s,show", part);
edje_object_signal_emit(VIEW(it), buf, "elm");
pair->content = content;
_sizing_eval(WIDGET(it)); _sizing_eval(WIDGET(it));
} }