devilhorns pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=e549612ab27694006317514f1ffb72d0ff28048e
commit e549612ab27694006317514f1ffb72d0ff28048e Author: Chris Michael <[email protected]> Date: Tue Jul 19 12:56:54 2016 -0400 terminology: Fix issue of icon not showing under wayland Essentially, set the proper icon_name. The icon_name should match the name of the .desktop file so that elementary can find the fdo icon to use. This fixes the issue of the window icon not showing up when running under Weston. With the proper .desktop file name now set, we no longer need to create and set an elm_win_icon_object. Fixes T3460 @fix Signed-off-by: Chris Michael <[email protected]> --- src/bin/win.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/bin/win.c b/src/bin/win.c index 3f6ba9c..bc64073 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -708,12 +708,11 @@ static Evas_Object * win_add(const char *name, const char *role, const char *title, const char *icon_name) { - Evas_Object *win, *o; - char buf[4096]; + Evas_Object *win; if (!name) name = "main"; if (!title) title = "Terminology"; - if (!icon_name) icon_name = "Terminology"; + if (!icon_name) icon_name = "terminology"; win = elm_win_add(NULL, name, ELM_WIN_BASIC); elm_win_title_set(win, title); @@ -722,12 +721,6 @@ win_add(const char *name, const char *role, elm_win_autodel_set(win, EINA_TRUE); - o = evas_object_image_add(evas_object_evas_get(win)); - snprintf(buf, sizeof(buf), "%s/images/terminology.png", - elm_app_data_dir_get()); - evas_object_image_file_set(o, buf, NULL); - elm_win_icon_object_set(win, o); - return win; } --
