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

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

fix T792
This commit is contained in:
Mike Blumenkrantz 2014-03-28 12:17:35 -04:00
parent 96806eb425
commit a291211b13
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/e_fm.c
View File

@ -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;
}