enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

switch order of desklock wallpaper finding when desklock is set to use "current desktop's wallpaper" so that it uses the default wallpaper AFTER checking if there's a custom one set for the current desk 

SVN revision: 76885
This commit is contained in:
Mike Blumenkrantz 2012-09-20 06:57:33 +00:00
parent 4ffdc87146
commit 4c7010aba0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_desklock.c
View File

@ -183,9 +183,6 @@ _user_wallpaper_get(E_Zone *zone)
const Eina_List *l;
E_Desk *desk;
if (e_config->desktop_default_background)
return e_config->desktop_default_background;
desk = e_desk_current_get(zone);
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
{
@ -196,6 +193,9 @@ _user_wallpaper_get(E_Zone *zone)
if (cdbg->file) return cdbg->file;
}
if (e_config->desktop_default_background)
return e_config->desktop_default_background;
return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
}