From ca99207bdc4ae76b02cd8ce6e5a953c17c9d9d0e Mon Sep 17 00:00:00 2001 From: Thanatermesis Date: Thu, 22 Feb 2018 19:35:38 +0100 Subject: [PATCH] Fix for window borders to accept edje icons If you have edje icons installed in your system (efreet smartly searches the candidate icon based in your Icon= entry), they works correctly in the menus, bar, etc... but doesn't works in the window borders icon, this is because the code try's to add it without dealing with the .edj extensions, probably attempting to load multiple image types and returning some errors/warning, resulting in an empty icon in the window borders Fixes T6723 --- src/bin/e_client.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 675ba5688..464f7f9bd 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -5144,12 +5144,9 @@ e_client_icon_add(E_Client *ec, Evas *evas) { if ((ec->desktop) && (ec->icon_preference != E_ICON_PREF_NETWM)) { - o = e_icon_add(evas); + o = e_util_desktop_icon_add(ec->desktop, 64, evas); if (o) - { - e_icon_fdo_icon_set(o, ec->desktop->icon); - return o; - } + return o; } #ifndef HAVE_WAYLAND_ONLY else if (ec->netwm.icons)