forked from enlightenment/enlightenment
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:
parent
4ffdc87146
commit
4c7010aba0
|
@ -183,9 +183,6 @@ _user_wallpaper_get(E_Zone *zone)
|
||||||
const Eina_List *l;
|
const Eina_List *l;
|
||||||
E_Desk *desk;
|
E_Desk *desk;
|
||||||
|
|
||||||
if (e_config->desktop_default_background)
|
|
||||||
return e_config->desktop_default_background;
|
|
||||||
|
|
||||||
desk = e_desk_current_get(zone);
|
desk = e_desk_current_get(zone);
|
||||||
EINA_LIST_FOREACH(e_config->desktop_backgrounds, l, cdbg)
|
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 (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");
|
return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue