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

fix bug where desklock background would not be correctly set when using "current desk's wallpaper" setting 

SVN revision: 76867
This commit is contained in:
Mike Blumenkrantz 2012-09-19 13:51:19 +00:00
parent 913e0493f7
commit 19566b810f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/e_desklock.c
View File

@ -177,16 +177,24 @@ e_desklock_shutdown(void)
}
static const char *
_user_wallpaper_get(void)
_user_wallpaper_get(E_Zone *zone)
{
const E_Config_Desktop_Background *cdbg;
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)
if (cdbg->file) return cdbg->file;
{
if ((cdbg->container > -1) && (cdbg->container != (int)zone->container->num)) continue;
if ((cdbg->zone > -1) && (cdbg->zone != (int)zone->num)) continue;
if ((cdbg->desk_x > -1) && (cdbg->desk_x != desk->x)) continue;
if ((cdbg->desk_y > -1) && (cdbg->desk_y != desk->y)) continue;
if (cdbg->file) return cdbg->file;
}
return e_theme_edje_file_get("base/theme/desklock", "e/desklock/background");
}
@ -456,7 +464,7 @@ _e_desklock_popup_add(E_Zone *zone)
const char *f;
if (!strcmp(bg, "user_background"))
f = _user_wallpaper_get();
f = _user_wallpaper_get(zone);
else
f = bg;