diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-03-27 19:57:39 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-03-27 19:57:39 +0000 |
| commit | c3104802ff92cfbba12b2eb7359ad1eb61a5146c (patch) | |
| tree | 634264e219f819c6f6187e62145beea946c70b71 /daemon/gvfsjobmove.c | |
| parent | 69a6a91b73fd21bbc54a60b4c540952eb2856cbb (diff) | |
| download | gvfs-c3104802ff92cfbba12b2eb7359ad1eb61a5146c.tar.gz | |
Handle all target exists errors correctly in move. This should make us not
2008-03-27 Alexander Larsson <alexl@redhat.com>
* daemon/gvfsbackendsftp.c:
Handle all target exists errors correctly
in move. This should make us not silently
overwrite files.
* daemon/gvfsjobmove.[ch]:
Add g_vfs_job_move_progress_callback
svn path=/trunk/; revision=1685
Diffstat (limited to 'daemon/gvfsjobmove.c')
| -rw-r--r-- | daemon/gvfsjobmove.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/daemon/gvfsjobmove.c b/daemon/gvfsjobmove.c index 222be9c9..e96a17aa 100644 --- a/daemon/gvfsjobmove.c +++ b/daemon/gvfsjobmove.c @@ -122,12 +122,11 @@ g_vfs_job_move_new (DBusConnection *connection, return G_VFS_JOB (job); } -static void -progress_callback (goffset current_num_bytes, - goffset total_num_bytes, - gpointer user_data) +void +g_vfs_job_move_progress_callback (goffset current_num_bytes, + goffset total_num_bytes, + GVfsJob *job) { - GVfsJob *job = G_VFS_JOB (user_data); GVfsJobDBus *dbus_job = G_VFS_JOB_DBUS (job); GVfsJobMove *op_job = G_VFS_JOB_MOVE (job); dbus_uint64_t current_dbus, total_dbus; @@ -175,7 +174,7 @@ run (GVfsJob *job) op_job->source, op_job->destination, op_job->flags, - progress_callback, + (GFileProgressCallback)g_vfs_job_move_progress_callback, job); } @@ -193,7 +192,7 @@ try (GVfsJob *job) op_job->source, op_job->destination, op_job->flags, - progress_callback, + (GFileProgressCallback)g_vfs_job_move_progress_callback, job); } |