diff options
Diffstat (limited to 'gvfs/gvfs.c')
| -rw-r--r-- | gvfs/gvfs.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gvfs/gvfs.c b/gvfs/gvfs.c index 0d0c318..197fca3 100644 --- a/gvfs/gvfs.c +++ b/gvfs/gvfs.c @@ -1326,7 +1326,7 @@ vfs_copy_progress_callback (goffset current_num_bytes, #define TUXCMD_DEFAULT_COPY_FLAGS G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS | G_FILE_COPY_ALL_METADATA TVFSResult -VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append) +VFSCopyToLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append) { GFile *src, *dst; GError *error; @@ -1334,20 +1334,20 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, if (globs->file == NULL) { - g_print ("(EE) VFSCopyOut: globs->file == NULL !\n"); + g_print ("(EE) VFSCopyToLocal: globs->file == NULL !\n"); return cVFS_Failed; } - g_print ("(II) VFSCopyOut: '%s' --> '%s'\n", sSrcName, sDstName); + g_print ("(II) VFSCopyToLocal: '%s' --> '%s'\n", sSrcName, sDstName); src = g_file_resolve_relative_path (globs->file, sSrcName); if (src == NULL) { - g_print ("(EE) VFSCopyOut: g_file_resolve_relative_path() failed.\n"); + g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n"); return cVFS_Failed; } dst = g_file_new_for_path (sDstName); if (dst == NULL) { - g_print ("(EE) VFSCopyOut: g_file_resolve_relative_path() failed.\n"); + g_print ("(EE) VFSCopyToLocal: g_file_resolve_relative_path() failed.\n"); return cVFS_Failed; } @@ -1357,7 +1357,7 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, error = NULL; g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &error); if (error) { - g_print ("(EE) VFSCopyOut: g_file_copy() error: %s\n", error->message); + g_print ("(EE) VFSCopyToLocal: g_file_copy() error: %s\n", error->message); // res = g_error_to_TVFSResult (error); if (error->code == G_IO_ERROR_CANCELLED) res = cVFS_Cancelled; @@ -1372,7 +1372,7 @@ VFSCopyOut (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, } TVFSResult -VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append) +VFSCopyFromLocal (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, gboolean Append) { GFile *src, *dst; GError *error; @@ -1380,20 +1380,20 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, if (globs->file == NULL) { - g_print ("(EE) VFSCopyIn: globs->file == NULL !\n"); + g_print ("(EE) VFSCopyFromLocal: globs->file == NULL !\n"); return cVFS_Failed; } - g_print ("(II) VFSCopyIn: '%s' --> '%s'\n", sSrcName, sDstName); + g_print ("(II) VFSCopyFromLocal: '%s' --> '%s'\n", sSrcName, sDstName); src = g_file_new_for_path (sSrcName); if (src == NULL) { - g_print ("(EE) VFSCopyIn: g_file_resolve_relative_path() failed.\n"); + g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n"); return cVFS_Failed; } dst = g_file_resolve_relative_path (globs->file, sDstName); if (dst == NULL) { - g_print ("(EE) VFSCopyIn: g_file_resolve_relative_path() failed.\n"); + g_print ("(EE) VFSCopyFromLocal: g_file_resolve_relative_path() failed.\n"); return cVFS_Failed; } @@ -1404,7 +1404,7 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, /* FIXME: Appending not supported */ g_file_copy (src, dst, TUXCMD_DEFAULT_COPY_FLAGS, globs->cancellable, vfs_copy_progress_callback, globs, &error); if (error) { - g_print ("(EE) VFSCopyIn: g_file_copy() error: %s\n", error->message); + g_print ("(EE) VFSCopyFromLocal: g_file_copy() error: %s\n", error->message); // res = g_error_to_TVFSResult (error); if (error->code == G_IO_ERROR_CANCELLED) res = cVFS_Cancelled; @@ -1424,7 +1424,7 @@ VFSCopyIn (struct TVFSGlobs *globs, const char *sSrcName, const char *sDstName, * TODO: * NOT NEEDED - block size settings for GIO subsystem * NOT NEEDED - variable block size for different protocols? - * - support for appending in VFSCopyIn + * - support for appending in VFSCopyFromLocal * DONE- authentication improvements (needs new VFS API) * ***/ |