From 25e4a66f11c8301188a539f72bd9123d68e7d4da Mon Sep 17 00:00:00 2001 From: Changyeon Lee Date: Tue, 19 Nov 2019 20:49:19 +0900 Subject: [PATCH] e_hwc_windows/e_info_server: check smart_object before get smart_data Change-Id: I2a468c5efde11b7ff513ff2fdfcd3fa339661269 --- src/bin/e_hwc_windows.c | 15 +++++++++------ src/bin/e_info_server.c | 11 +++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c index c24d6c2..a9bf5f6 100644 --- a/src/bin/e_hwc_windows.c +++ b/src/bin/e_hwc_windows.c @@ -570,15 +570,18 @@ _e_hwc_windows_client_get_from_object(Evas_Object *o) ec = evas_object_data_get(ob, "E_Client"); if (ec) break; - if (evas_object_smart_data_get(ob)) + if (evas_object_smart_smart_get(ob)) { - members = evas_object_smart_members_get(ob); + if (evas_object_smart_data_get(ob)) + { + members = evas_object_smart_members_get(ob); - EINA_LIST_FOREACH(members, l, cob) - stack = eina_list_append(stack, cob); + EINA_LIST_FOREACH(members, l, cob) + stack = eina_list_append(stack, cob); - if (members) - eina_list_free(members); + if (members) + eina_list_free(members); + } } stack = eina_list_remove(stack, ob); diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index 81937b6..6c68385 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -752,12 +752,15 @@ _e_info_server_cb_compobjs(const Eldbus_Service_Interface *iface EINA_UNUSED, co queue = eina_list_append(queue, cobj); /* 3. push : child objects */ - if (evas_object_smart_data_get(info->o)) + if (evas_object_smart_smart_get(info->o)) { - EINA_LIST_FOREACH(evas_object_smart_members_get(info->o), ll, c) + if (evas_object_smart_data_get(info->o)) { - info2 = _obj_info_get(info->o, c, info->depth + 1); - stack = eina_list_append(stack, info2); + EINA_LIST_FOREACH(evas_object_smart_members_get(info->o), ll, c) + { + info2 = _obj_info_get(info->o, c, info->depth + 1); + stack = eina_list_append(stack, info2); + } } } -- 2.7.4