vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2016-07-19 12:56:54 -04:00
parent 83db7b1ed0
commit e549612ab2
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/win.c
View File

@ -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;
}