[gvfs] afp: Always close fork when doing close_write()



commit 69592187e89e5757214fd2be5eb558e2dfc5d6da
Author: Carl-Anton Ingmarsson <ca ingmarsson gmail com>
Date:   Thu Aug 9 20:23:40 2012 +0200

    afp: Always close fork when doing close_write()
    
    Don't error out if we're unable to get the etag and just continue instead.

 daemon/gvfsbackendafp.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/daemon/gvfsbackendafp.c b/daemon/gvfsbackendafp.c
index 4fc5628..4018389 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);
 }
   



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]