summaryrefslogtreecommitdiff
path: root/daemon/gvfsbackendtrash.c
diff options
context:
space:
mode:
authorPaolo Borelli <pborelli@katamail.com>2008-03-28 08:59:11 +0000
committerPaolo Borelli <pborelli@src.gnome.org>2008-03-28 08:59:11 +0000
commit811a7f91acdc48630508e0387afc1ca338514321 (patch)
tree2dac6ef6e02c15d1c9938cd954f9fc995b24c2f2 /daemon/gvfsbackendtrash.c
parent2c0980778e78c8bc60371a095c0abb890d81039e (diff)
downloadgvfs-811a7f91acdc48630508e0387afc1ca338514321.tar.gz
plug some minor memory leaks.
2008-03-28 Paolo Borelli <pborelli@katamail.com> * daemon/gvfsbackendtrash.c: plug some minor memory leaks. svn path=/trunk/; revision=1687
Diffstat (limited to 'daemon/gvfsbackendtrash.c')
-rw-r--r--daemon/gvfsbackendtrash.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 14dcbaa9..f8990084 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -573,6 +573,10 @@ list_trash_dirs (void)
has_trash_files = TRUE;
}
+ g_list_foreach (topdirs, (GFunc) g_free, NULL);
+ g_list_free (topdirs);
+ g_list_free (topdirs_info);
+
return g_list_reverse (dirs);
}
@@ -1007,9 +1011,6 @@ enumerate_root_trashdir (GVfsBackend *backend,
{
GFile *file, *files_file;
GFileEnumerator *enumerator;
- GFileInfo *info;
- const char *name;
- char *new_name, *new_name_escaped;
char *info_dir;
info_dir = g_build_filename (trashdir, "info", NULL);
@@ -1027,10 +1028,15 @@ enumerate_root_trashdir (GVfsBackend *backend,
if (enumerator)
{
+ GFileInfo *info;
+
while ((info = g_file_enumerator_next_file (enumerator,
job ? G_VFS_JOB (job)->cancellable : NULL,
NULL)) != NULL)
{
+ const char *name;
+ char *new_name, *new_name_escaped;
+
name = g_file_info_get_name (info);
/* Get the display name, etc */
@@ -1058,6 +1064,8 @@ enumerate_root_trashdir (GVfsBackend *backend,
NULL);
g_object_unref (enumerator);
}
+
+ g_free (info_dir);
}
static GList *