# HG changeset patch
# User Michael Albinus <albinus@detlef>
# Date 1278836884 -7200
# Node ID 1d46091f1f65c571b7919dff7684feba12324a11
# Parent  3200fb11db9d808f30527281130ad7bf19b92114
* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
empty argument to gvfs-copy.

diff -r 3200fb11db9d -r 1d46091f1f65 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jul 11 02:59:55 2010 -0400
+++ b/lisp/ChangeLog	Sun Jul 11 10:28:04 2010 +0200
@@ -1,3 +1,8 @@
+2010-07-11  Magnus Henoch  <magnus.henoch@gmail.com>
+
+	* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
+	empty argument to gvfs-copy.
+
 2010-07-10  Aleksei Gusev  <aleksei.gusev@gmail.com>  (tiny change)
 
 	* progmodes/compile.el (compilation-error-regexp-alist-alist): Add
diff -r 3200fb11db9d -r 1d46091f1f65 lisp/net/tramp-gvfs.el
--- a/lisp/net/tramp-gvfs.el	Sun Jul 11 02:59:55 2010 -0400
+++ b/lisp/net/tramp-gvfs.el	Sun Jul 11 10:28:04 2010 +0200
@@ -551,11 +551,14 @@
 	 (tramp-message v 4 "`copy-file' failed, trying `gvfs-copy'")
 	 (unless
 	     (zerop
-	      (tramp-gvfs-send-command
-	       v "gvfs-copy"
-	       (if (or keep-date preserve-uid-gid) "--preserve" "")
-	       (tramp-gvfs-url-file-name filename)
-	       (tramp-gvfs-url-file-name newname)))
+	      (let ((args
+		     (append (if (or keep-date preserve-uid-gid)
+				 (list "--preserve")
+			       nil)
+			     (list
+			      (tramp-gvfs-url-file-name filename)
+			      (tramp-gvfs-url-file-name newname)))))
+		(apply 'tramp-gvfs-send-command v "gvfs-copy" args)))
 	   ;; Propagate the error.
 	   (tramp-error v (car err) "%s" (cdr err)))))))