From: Junseok, Kim Date: Wed, 29 Jul 2020 01:40:56 +0000 (+0900) Subject: Revert "e_info_server: change from eina_stringshare to char array as client title" X-Git-Tag: submit/tizen/20200729.055340~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81126bdb9031bbf88691d826a703a2c0dd512114;p=platform%2Fupstream%2Fenlightenment.git Revert "e_info_server: change from eina_stringshare to char array as client title" This reverts commit 120a9549ea8a375121d19b8b5b041309c8637af9. Change-Id: I08143062635a5fcb02397b7b15b2ae35a983c30b Signed-off-by: Junseok, Kim --- diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c index bf7c4e7f65..9402b4380d 100644 --- a/src/bin/e_info_server.c +++ b/src/bin/e_info_server.c @@ -242,8 +242,7 @@ _msg_ecs_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible) Ecore_Window pwin; uint32_t res_id = 0; pid_t pid = -1; - char layer_name[35] = {0}; - char title[256] = {0}; + char layer_name[32]; int hwc = -1, hwc_policy = E_HWC_POLICY_NONE, pl_zpos = -999; int iconified = 0; Eina_Bool has_input_region = EINA_FALSE; @@ -300,14 +299,12 @@ _msg_ecs_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible) eldbus_message_iter_arguments_append(array_of_ec, "("VALUE_TYPE_FOR_TOPVWINS")", &struct_of_ec); - snprintf(title, sizeof(title), "%s", e_client_util_name_get(ec) ?: "NO NAME"); - eldbus_message_iter_arguments_append (struct_of_ec, VALUE_TYPE_FOR_TOPVWINS, win, res_id, pid, - title, + e_client_util_name_get(ec) ?: "NO NAME", x, y, w, h, ec->layer, ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, ec->visibility.force_obscured, iconified, evas_object_visible_get(ec->frame), ec->focused, hwc, hwc_policy, pl_zpos, pwin, layer_name, has_input_region, transformed); @@ -335,8 +332,7 @@ _msg_clients_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible) Ecore_Window pwin; uint32_t res_id = 0; pid_t pid = -1; - char layer_name[35] = {0}; - char title[256] = {0}; + char layer_name[32]; int hwc = -1, hwc_policy = E_HWC_POLICY_NONE, pl_zpos = -999; int iconified = 0; Eina_Bool has_input_region = EINA_FALSE; @@ -393,14 +389,12 @@ _msg_clients_append(Eldbus_Message_Iter *iter, Eina_Bool is_visible) eldbus_message_iter_arguments_append(array_of_ec, "("VALUE_TYPE_FOR_TOPVWINS")", &struct_of_ec); - snprintf(title, sizeof(title), "%s", e_client_util_name_get(ec) ?: "NO NAME"); - eldbus_message_iter_arguments_append (struct_of_ec, VALUE_TYPE_FOR_TOPVWINS, win, res_id, pid, - title, + e_client_util_name_get(ec) ?: "NO NAME", ec->x, ec->y, ec->w, ec->h, ec->layer, ec->visible, mapped, ec->argb, ec->visibility.opaque, ec->visibility.obscured, ec->visibility.force_obscured, iconified, evas_object_visible_get(ec->frame), ec->focused, hwc, hwc_policy, pl_zpos, pwin, layer_name, has_input_region, transformed);