summaryrefslogtreecommitdiff
path: root/daemon/gvfsjobenumerate.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-10-04 14:08:11 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-10-04 14:08:11 +0000
commitefd8ab55dd85159397c043b03efe54d47c28c307 (patch)
tree870cad51a8485bf4ab0b3c3d756138aa3ab70193 /daemon/gvfsjobenumerate.c
parent14f210480005deb8a9cb4e23d07f8ba979ee29bb (diff)
downloadgvfs-efd8ab55dd85159397c043b03efe54d47c28c307.tar.gz
Allow NULL end pointer
2007-10-04 Alexander Larsson <alexl@redhat.com> * common/gvfsuriutils.c: (g_uri_unescape_string): Allow NULL end pointer * daemon/gvfsjob.[ch]: Add cancellable to GVfsJob for backends that want one * daemon/gvfsjobenumerate.[ch]: * daemon/gvfsjobqueryinfo.[ch]: Also store attribute in string form. Needed if you want to pass it on into gio. * daemon/Makefile.am: * daemon/gvfsbackendtrash.[ch]: * daemon/trash.mount.in: Added. Added trash backend svn path=/trunk/; revision=968
Diffstat (limited to 'daemon/gvfsjobenumerate.c')
-rw-r--r--daemon/gvfsjobenumerate.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index d30971bf..ac97da93 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -29,6 +29,7 @@ g_vfs_job_enumerate_finalize (GObject *object)
job = G_VFS_JOB_ENUMERATE (object);
g_free (job->filename);
+ g_free (job->attributes);
g_file_attribute_matcher_unref (job->attribute_matcher);
g_free (job->object_path);
@@ -95,6 +96,7 @@ g_vfs_job_enumerate_new (DBusConnection *connection,
job->object_path = g_strdup (obj_path);
job->filename = g_strndup (path_data, path_len);
job->backend = backend;
+ job->attributes = g_strdup (attributes);
job->attribute_matcher = g_file_attribute_matcher_new (attributes);
job->flags = flags;