From: Mike Blumenkrantz <zmike@samsung.com>
Date: Fri, 28 Mar 2014 16:17:35 +0000 (-0400)
Subject: bugfix: efm current .desktop fetching now returns the right .desktop
X-Git-Tag: submit/tizen/20150311.085739^2~1273
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a291211b1355befc2febfdac844f4bc9e9fc3e1b;p=platform%2Fupstream%2Fenlightenment.git

bugfix: efm current .desktop fetching now returns the right .desktop

fix T792
---

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index bc6bec0e3b..225cad2357 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -10085,11 +10085,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;
 }
@@ -11625,6 +11630,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;
 }