forked from enlightenment/enlightenment
more leaks gone in trash code that isn't used
SVN revision: 80924
This commit is contained in:
parent
799e6b5a5e
commit
8347b33d9c
|
@ -1267,18 +1267,14 @@ _e_fm_ipc_cb_fop_trash_idler(void *data)
|
||||||
|
|
||||||
/* Check that 'home trash' and subsequesnt dirs exists, create if not */
|
/* Check that 'home trash' and subsequesnt dirs exists, create if not */
|
||||||
snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get());
|
snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get());
|
||||||
trash_dir = strdup(buf);
|
trash_dir = strdupa(buf);
|
||||||
snprintf(buf, sizeof(buf), "%s/files", trash_dir);
|
snprintf(buf, sizeof(buf), "%s/files", trash_dir);
|
||||||
if (!ecore_file_mkpath(buf)) return 0;
|
if (!ecore_file_mkpath(buf)) return 0;
|
||||||
snprintf(buf, sizeof(buf), "%s/info", trash_dir);
|
snprintf(buf, sizeof(buf), "%s/info", trash_dir);
|
||||||
if (!ecore_file_mkpath(buf)) return 0;
|
if (!ecore_file_mkpath(buf)) return 0;
|
||||||
|
|
||||||
filename = strrchr(fop->src, '/');
|
filename = strrchr(fop->src, '/');
|
||||||
if (!filename)
|
if (!filename) return 0;
|
||||||
{
|
|
||||||
free(trash_dir);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
escname = ecore_file_escape_name(filename);
|
escname = ecore_file_escape_name(filename);
|
||||||
|
|
||||||
/* Find path for info file. Pointer address is part of the filename to
|
/* Find path for info file. Pointer address is part of the filename to
|
||||||
|
@ -1299,7 +1295,6 @@ _e_fm_ipc_cb_fop_trash_idler(void *data)
|
||||||
{
|
{
|
||||||
/* Move failed. Spec says delete files that can't be trashed */
|
/* Move failed. Spec says delete files that can't be trashed */
|
||||||
free(dest);
|
free(dest);
|
||||||
free(trash_dir);
|
|
||||||
ecore_file_unlink(fop->src);
|
ecore_file_unlink(fop->src);
|
||||||
return ECORE_CALLBACK_CANCEL;
|
return ECORE_CALLBACK_CANCEL;
|
||||||
}
|
}
|
||||||
|
@ -1326,7 +1321,6 @@ _e_fm_ipc_cb_fop_trash_idler(void *data)
|
||||||
rename(dest, fop->src);
|
rename(dest, fop->src);
|
||||||
|
|
||||||
free(dest);
|
free(dest);
|
||||||
free(trash_dir);
|
|
||||||
eina_stringshare_del(fop->src);
|
eina_stringshare_del(fop->src);
|
||||||
eina_stringshare_del(fop->dst);
|
eina_stringshare_del(fop->dst);
|
||||||
_e_fops = eina_list_remove(_e_fops, fop);
|
_e_fops = eina_list_remove(_e_fops, fop);
|
||||||
|
|
Loading…
Reference in New Issue