kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efreet desktop tracking - fix monitoring of dirs of custom desktops 

@fix

this is wrong - start monitoring every/any dir in which a desktop file
exists that we load a desktop file from. imagine you browse directories
in efm with lots of desktop files in them - we end up monitoring lots
of directories that we then rememebr and don't un-monitor. this
disables monitoring of dirs from which we load a .desktop file from to
fix this.
This commit is contained in:
Carsten Haitzler 2015-12-02 20:29:31 +09:00
parent a7a2781a00
commit 5263e61585
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/efreet/efreetd_cache.c
View File

@ -698,7 +698,9 @@ error:
static void
read_lists(void)
{
fill_list("extra_desktops.dirs", &desktop_extra_dirs);
// dont use extra dirs as the only way to get extra dirs is by loading a
// specific desktop file at a specific path, and this is wrong
// fill_list("extra_desktops.dirs", &desktop_extra_dirs);
fill_list("extra_icons.dirs", &icon_extra_dirs);
fill_list("icons.exts", &icon_exts);
}

8
src/lib/efreet/efreet_desktop.c
View File

@ -154,7 +154,12 @@ efreet_desktop_get(const char *file)
desktop = efreet_desktop_new(file);
if (!desktop) return NULL;
return desktop;
// this is wrong - start monitoring every/any dir in which a desktop file
// exists that we load a desktop file from. imagine you browse directories
// in efm with lots of desktop files in them - we end up monitoring lots
// of directories that we then rememebr and don't un-monitor.
#if 0
/* If we didn't find this file in the eet cache, add path to search path */
if (!desktop->eet)
{
@ -185,6 +190,7 @@ efreet_desktop_get(const char *file)
}
}
return desktop;
#endif
}
EAPI int