forked from enlightenment/enlightenment
allow for .e_background.bg.db to be the background for a dir...
SVN revision: 5521
This commit is contained in:
parent
b7fde63e68
commit
ba4e1cf47b
|
@ -173,6 +173,7 @@ e_desktops_init_file_display(E_Desktop *desk)
|
|||
{
|
||||
E_View *v;
|
||||
E_Border *b;
|
||||
char buf[PATH_MAX];
|
||||
|
||||
v = e_view_new();
|
||||
v->size.w = desk->real.w;
|
||||
|
@ -184,17 +185,12 @@ e_desktops_init_file_display(E_Desktop *desk)
|
|||
/* uncomment this and comment out the next line for some tress testing */
|
||||
/* e_strdup(v->dir, "/dev"); */
|
||||
/* e_strdup(v->dir, e_file_home()); */
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
sprintf(buf, "%s/desktop/default", e_config_user_dir());
|
||||
e_strdup(v->dir, buf);
|
||||
}
|
||||
|
||||
/* FIXME: load bg here */
|
||||
sprintf(buf, "%s/.e_background.bg.db", v->dir);
|
||||
v->bg = e_background_load(buf);
|
||||
if (!v->bg)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds"));
|
||||
v->bg = e_background_load(buf);
|
||||
}
|
||||
|
|
|
@ -616,9 +616,10 @@ e_view_icon_exec(E_Icon *ic)
|
|||
v->size.h = 300;
|
||||
v->options.back_pixmap = 0;
|
||||
/* Load default bg then handle bg in metadata */
|
||||
sprintf(buf, "%s/%s/.e_background.bg.db", ic->view->dir, ic->file);
|
||||
v->bg = e_background_load(buf);
|
||||
if (!v->bg)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
sprintf(buf, "%s/view.bg.db", e_config_get("backgrounds"));
|
||||
v->bg = e_background_load(buf);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue