discomfitor pushed a commit to branch enlightenment-0.18. http://git.enlightenment.org/core/enlightenment.git/commit/?id=570651635a8b9a71f1948488552885aedc76c8e6
commit 570651635a8b9a71f1948488552885aedc76c8e6 Author: Mike Blumenkrantz <[email protected]> Date: Fri Mar 28 12:17:35 2014 -0400 bugfix: efm current .desktop fetching now returns the right .desktop fix T792 --- src/bin/e_fm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index fb662d5..8356366 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10132,11 +10132,16 @@ _e_fm2_desktop_open(E_Fm2_Smart_Data *sd) Eina_Bool ret; snprintf(buf, sizeof(buf), "%s/.directory.desktop", sd->realpath); + if (sd->desktop) + { + if (!e_util_strcmp(buf, sd->desktop->orig_path)) return 1; + } ret = ecore_file_exists(buf) ? ecore_file_can_write(buf) : ecore_file_can_write(sd->realpath); if (!ret) return -1; ef = efreet_desktop_new(buf); if (!ef) return 0; + efreet_desktop_free(sd->desktop); sd->desktop = ef; return 1; } @@ -11668,6 +11673,7 @@ EAPI Efreet_Desktop * e_fm2_desktop_get(Evas_Object *obj) { EFM_SMART_CHECK(NULL); + if (_e_fm2_desktop_open(sd) != 1) return NULL; return sd->desktop; } --
