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

elm_conform.c: Use more ELM_SAFE_FREE macros.

This commit is contained in:
Daniel Juyung Seo 2013-10-29 22:49:43 +09:00
parent e8a029b153
commit a437e66219
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
legacy/elementary/src/lib/elm_conform.c
View File

@ -248,11 +248,8 @@ _conformant_parts_swallow(Evas_Object *obj)
evas_object_color_set(sd->virtualkeypad, 0, 0, 0, 0);
elm_layout_content_set(obj, VIRTUALKEYPAD_PART, sd->virtualkeypad);
}
else if (sd->virtualkeypad)
{
evas_object_del(sd->virtualkeypad);
sd->virtualkeypad = NULL;
}
else
ELM_SAFE_FREE(sd->virtualkeypad, evas_object_del);
//Clipboard
if (edje_object_part_exists(wd->resize_obj, CLIPBOARD_PART))
@ -269,11 +266,8 @@ _conformant_parts_swallow(Evas_Object *obj)
evas_object_color_set(sd->clipboard, 0, 0, 0, 0);
elm_layout_content_set(obj, CLIPBOARD_PART, sd->clipboard);
}
else if (sd->clipboard)
{
evas_object_del(sd->clipboard);
sd->clipboard = NULL;
}
else
ELM_SAFE_FREE(sd->clipboard, evas_object_del);
//Softkey
if (edje_object_part_exists(wd->resize_obj, SOFTKEY_PART))
@ -290,11 +284,8 @@ _conformant_parts_swallow(Evas_Object *obj)
evas_object_color_set(sd->softkey, 0, 0, 0, 0);
elm_layout_content_set(obj, SOFTKEY_PART, sd->softkey);
}
else if (sd->softkey)
{
evas_object_del(sd->softkey);
sd->softkey = NULL;
}
else
ELM_SAFE_FREE(sd->softkey, evas_object_del);
}
static Eina_Bool