parent
6e94e17dc8
commit
c390747c30
|
@ -2509,16 +2509,13 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
|
|||
snprintf(buf, sizeof(buf), "%s/%s", ic->sd->realpath, ic->info.file);
|
||||
|
||||
desktop = efreet_desktop_get(buf);
|
||||
if (desktop)
|
||||
{
|
||||
if (!desktop) goto error;
|
||||
if (desktop->type != EFREET_DESKTOP_TYPE_LINK) goto error;
|
||||
|
||||
if (desktop->name) ic->info.label = evas_stringshare_add(desktop->name);
|
||||
if (desktop->generic_name) ic->info.generic = evas_stringshare_add(desktop->generic_name);
|
||||
if (desktop->comment) ic->info.comment = evas_stringshare_add(desktop->comment);
|
||||
|
||||
if (desktop->icon) ic->info.icon = evas_stringshare_add(desktop->icon);
|
||||
|
||||
if (desktop->type == EFREET_DESKTOP_TYPE_LINK)
|
||||
{
|
||||
if (desktop->url)
|
||||
ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->url);
|
||||
if (desktop->x)
|
||||
|
@ -2532,8 +2529,6 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
|
|||
else if (!strcmp(type, "Removable")) ic->info.removable = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
error:
|
||||
|
|
Loading…
Reference in New Issue