forked from enlightenment/efl
Avoid returning stack trash, thanks nash.
SVN revision: 49730
This commit is contained in:
parent
bed3589df5
commit
dc9ae7395b
|
@ -493,7 +493,6 @@ elm_hover_content_unset(Evas_Object *obj, const char *swallow)
|
|||
ELM_CHECK_WIDTYPE(obj, widtype);
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Subinfo *si;
|
||||
Evas_Object *content;
|
||||
const Eina_List *l;
|
||||
char buf[1024];
|
||||
if (!wd) return NULL;
|
||||
|
@ -502,15 +501,16 @@ elm_hover_content_unset(Evas_Object *obj, const char *swallow)
|
|||
{
|
||||
if (!strcmp(buf, si->swallow))
|
||||
{
|
||||
Evas_Object *content;
|
||||
if (!si->obj) return NULL;
|
||||
content = si->obj;
|
||||
elm_widget_sub_object_del(obj, si->obj);
|
||||
edje_object_part_unswallow(wd->cov, si->obj);
|
||||
si->obj = NULL;
|
||||
break;
|
||||
return content;
|
||||
}
|
||||
}
|
||||
return content;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -271,22 +271,22 @@ elm_layout_content_unset(Evas_Object *obj, const char *swallow)
|
|||
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Subinfo *si;
|
||||
Evas_Object *content;
|
||||
const Eina_List *l;
|
||||
if (!wd) return NULL;
|
||||
EINA_LIST_FOREACH(wd->subs, l, si)
|
||||
{
|
||||
if (!strcmp(swallow, si->swallow))
|
||||
{
|
||||
Evas_Object *content;
|
||||
if (!si->obj) return NULL;
|
||||
content = si->obj;
|
||||
elm_widget_sub_object_del(obj, si->obj);
|
||||
edje_object_part_unswallow(wd->lay, si->obj);
|
||||
si->obj = NULL;
|
||||
break;
|
||||
return content;
|
||||
}
|
||||
}
|
||||
return content;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue