diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-10-04 14:08:11 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-10-04 14:08:11 +0000 |
| commit | efd8ab55dd85159397c043b03efe54d47c28c307 (patch) | |
| tree | 870cad51a8485bf4ab0b3c3d756138aa3ab70193 /daemon/gvfsjob.c | |
| parent | 14f210480005deb8a9cb4e23d07f8ba979ee29bb (diff) | |
| download | gvfs-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/gvfsjob.c')
| -rw-r--r-- | daemon/gvfsjob.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/daemon/gvfsjob.c b/daemon/gvfsjob.c index 22ff91b9..95129237 100644 --- a/daemon/gvfsjob.c +++ b/daemon/gvfsjob.c @@ -57,6 +57,8 @@ g_vfs_job_finalize (GObject *object) if (job->backend_data_destroy) job->backend_data_destroy (job->backend_data); + + g_object_unref (job->cancellable); if (G_OBJECT_CLASS (g_vfs_job_parent_class)->finalize) (*G_OBJECT_CLASS (g_vfs_job_parent_class)->finalize) (object); @@ -111,6 +113,8 @@ static void g_vfs_job_init (GVfsJob *job) { job->priv = G_TYPE_INSTANCE_GET_PRIVATE (job, G_VFS_TYPE_JOB, GVfsJobPrivate); + + job->cancellable = g_cancellable_new (); } @@ -182,6 +186,7 @@ g_vfs_job_cancel (GVfsJob *job) job->cancelled = TRUE; g_signal_emit (job, signals[CANCELLED], 0); + g_cancellable_cancel (job->cancellable); } static void |