aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2015-12-02 20:29:31 +0900
committerChris Michael <cp.michael@samsung.com>2015-12-03 11:31:06 -0500
commita87eb94ffed408914b459c9411455d8660c51178 (patch)
tree10f66ff8edc4966e00edd670eb4c4cd21c244335
parentbuild: fix distcheck after model saver and loader rework (diff)
downloadefl-a87eb94ffed408914b459c9411455d8660c51178.tar.gz
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.
-rw-r--r--src/bin/efreet/efreetd_cache.c4
-rw-r--r--src/lib/efreet/efreet_desktop.c8
2 files changed, 10 insertions, 2 deletions
diff --git a/src/bin/efreet/efreetd_cache.c b/src/bin/efreet/efreetd_cache.c
index e1896e72c8..6fa88546b0 100644
--- a/src/bin/efreet/efreetd_cache.c
+++ b/src/bin/efreet/efreetd_cache.c
@@ -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);
}
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index 3de19be370..a49a975776 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -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