swagtoy
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re-order icon finding for border to use the most reliable source first

This commit is contained in:
Carsten Haitzler 2014-04-19 09:08:02 +09:00
parent ffcc5e72d9
commit 8e49b69796
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_client.c
View File

@ -1911,6 +1911,12 @@ _e_client_eval(E_Client *ec)
ec->desktop = d;
}
}
if (!ec->desktop)
{
ec->desktop = e_exec_startup_id_pid_find(ec->netwm.startup_id,
ec->netwm.pid);
if (ec->desktop) efreet_desktop_ref(ec->desktop);
}
if (!ec->desktop)
{
if (ec->internal && (ec->icccm.class && (!strncmp(ec->icccm.class, "e_fwin::", 8))))
@ -1922,6 +1928,10 @@ _e_client_eval(E_Client *ec)
ec->desktop = efreet_util_desktop_wm_class_find(ec->icccm.name,
ec->icccm.class);
}
if (!ec->desktop && ec->icccm.command.argv && (ec->icccm.command.argc > 0))
{
ec->desktop = efreet_util_desktop_exec_find(ec->icccm.command.argv[0]);
}
if (!ec->desktop)
{
/* libreoffice and maybe others match window class
@ -1943,12 +1953,6 @@ _e_client_eval(E_Client *ec)
}
}
}
if (!ec->desktop)
{
ec->desktop = e_exec_startup_id_pid_find(ec->netwm.startup_id,
ec->netwm.pid);
if (ec->desktop) efreet_desktop_ref(ec->desktop);
}
if (!ec->desktop && ec->icccm.name)
{
/* this works for most cases as fallback. useful when app is