From 4c7010aba0b5306ab275add529b7bf9aadad31fb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 20 Sep 2012 06:57:33 +0000 Subject: [PATCH] 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 --- src/bin/e_desklock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c index baff99ef9..55a25ff46 100644 --- a/src/bin/e_desklock.c +++ b/src/bin/e_desklock.c @@ -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"); }