seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=8f523ed25329b25845fc8d679dac1cd9ce2542d1
commit 8f523ed25329b25845fc8d679dac1cd9ce2542d1 Author: Daniel Juyung Seo <[email protected]> Date: Tue Oct 29 22:49:43 2013 +0900 elm_conform.c: Use more ELM_SAFE_FREE macros. --- src/lib/elm_conform.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index f73c921..9636ab8 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -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 --
