summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2012-08-09 20:23:40 +0200
committerCarl-Anton Ingmarsson <ca.ingmarsson@gmail.com>2012-08-09 21:06:05 +0200
commit69592187e89e5757214fd2be5eb558e2dfc5d6da (patch)
tree3071cb1e403cdcbd78f013a0fb1b138281e6c5cf
parent01fd300d7a015031827ba947c6cf38416ed8dd1a (diff)
downloadgvfs-69592187e89e5757214fd2be5eb558e2dfc5d6da.tar.gz
afp: Always close fork when doing close_write()
Don't error out if we're unable to get the etag and just continue instead.
-rw-r--r--daemon/gvfsbackendafp.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/daemon/gvfsbackendafp.c b/daemon/gvfsbackendafp.c
index 4fc56282..40183898 100644
--- a/daemon/gvfsbackendafp.c
+++ b/daemon/gvfsbackendafp.c
@@ -1021,20 +1021,12 @@ close_write_get_fork_parms_cb (GObject *source_object, GAsyncResult *res, gpoint
AfpHandle *afp_handle = (AfpHandle *)job->handle;
- GError *err = NULL;
GFileInfo *info;
- info = g_vfs_afp_volume_get_fork_parms_finish (volume, res, &err);
- if (!info)
- {
- g_vfs_job_failed_from_error (G_VFS_JOB (job), err);
- g_error_free (err);
+ info = g_vfs_afp_volume_get_fork_parms_finish (volume, res, NULL);
+ if (info)
+ g_vfs_job_close_write_set_etag (job, g_file_info_get_etag (info));
- afp_handle_free (afp_handle);
- return;
- }
-
- g_vfs_job_close_write_set_etag (job, g_file_info_get_etag (info));
close_fork (volume, G_VFS_JOB (job), afp_handle);
}