[gvfs/mtp-1.14.0: 37/49] "Fix" pulling of directories.

[Philip Langdale <philipl src gnome org>]

commit 726f4c4d0ae48a0f9b46dfc3257a1f15a3b21c56
Author: Philip Langdale <philipl overt org>
Date:   Wed Oct 10 13:25:18 2012 -0700

    "Fix" pulling of directories.
    
    No, this doesn't make recursive pull magically work, but it allows
    a pull on a directory to make that directory, or silently succeed
    if the directory exists already.
    
    This does have the beneficial effect that file-roller can now
    compress a directory from an mtp mount - if you ignore the fact
    that it doesn't use display names.

 daemon/gvfsbackendmtp.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gvfsbackendmtp.c b/daemon/gvfsbackendmtp.c
index 6f4158d..b14b19b 100644
--- a/daemon/gvfsbackendmtp.c
+++ b/daemon/gvfsbackendmtp.c
@@ -948,8 +948,12 @@ do_pull(GVfsBackend *backend,
       error = NULL;
       if (g_file_make_directory (file, G_VFS_JOB (job)->cancellable, &error)) {
         g_vfs_job_succeeded (G_VFS_JOB (job));
+      } else if (error->code == G_IO_ERROR_EXISTS) {
+        g_vfs_job_succeeded (G_VFS_JOB (job));
+        g_error_free (error);
       } else {
         g_vfs_job_failed_from_error (G_VFS_JOB (job), error); 
+        DEBUG ("(II) pull dir failed: %s", error->message);
         g_error_free (error);
       }
       g_object_unref (file);
@@ -967,10 +971,9 @@ do_pull(GVfsBackend *backend,
         fail_job(G_VFS_JOB(job), device);
         goto exit;
       }
+    g_vfs_job_succeeded (G_VFS_JOB (job));
   }
 
-  g_vfs_job_succeeded (G_VFS_JOB (job));
-
  exit:
   if (info != NULL) {
     g_object_unref(info);