enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

allow relative path for icon files in .desktops 

SVN revision: 33174
This commit is contained in:
Carsten Haitzler 2007-12-18 01:42:08 +00:00
parent 032ee2c2cb
commit 6d69f2cd7f
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/bin/e_fm.c
View File

@ -1108,11 +1108,43 @@ e_fm2_icon_get(Evas *evas, E_Fm2_Icon *ic,
if (ic->info.icon)
{
/* custom icon */
if (ic->info.icon[0] == '/')
if ((ic->info.icon[0] == '/') ||
(!strncmp(ic->info.icon, "./", 2)) ||
(!strncmp(ic->info.icon, "../", 3)))
{
char *icfile = NULL;
/* path to icon file */
icfile = ic->info.icon;
if (!strncmp(ic->info.icon, "./", 2))
{
/* relative path */
snprintf(buf, sizeof(buf), "%s/%s",
e_fm2_real_path_get(ic->info.fm),
ic->info.icon + 2);
icfile = buf;
}
else if (!strncmp(ic->info.icon, "../", 3))
{
char *dirpath;
/* relative path - parent */
dirpath = strdup(e_fm2_real_path_get(ic->info.fm));
if (dirpath)
{
p = strrchr(dirpath, '/');
if (p)
{
*p = 0;
snprintf(buf, sizeof(buf), "%s/%s", dirpath,
ic->info.icon + 3);
icfile = buf;
}
free(dirpath);
}
}
p = strrchr(ic->info.icon, '.');
if ((p) && (!strcmp(p, ".edj")))
if ((p) && (!strcasecmp(p, ".edj")))
{
oic = edje_object_add(evas);
if (!edje_object_file_set(oic, ic->info.icon, "icon"))