diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 12:06:40 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 12:06:40 +0000 |
| commit | da4c618f4124da6adc80578fc4410ee2904ef2a2 (patch) | |
| tree | d491b95013e333a29305d77858f0209083a0f176 /daemon/gvfschannel.c | |
| parent | 29273dce9eb75ee2d9d93a1ed9d142ac6492ad7d (diff) | |
| download | gvfs-da4c618f4124da6adc80578fc4410ee2904ef2a2.tar.gz | |
Handle WRITE_CLOSE specially too
Original git commit by Alexander Larsson <alex@greebo.(none)> at 1172069748 +0100
svn path=/trunk/; revision=371
Diffstat (limited to 'daemon/gvfschannel.c')
| -rw-r--r-- | daemon/gvfschannel.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/daemon/gvfschannel.c b/daemon/gvfschannel.c index 65d37b30..8e0cfc8c 100644 --- a/daemon/gvfschannel.c +++ b/daemon/gvfschannel.c @@ -17,9 +17,8 @@ #include <gio/goutputstreamsocket.h> #include <gvfsdaemonprotocol.h> #include <gvfsdaemonutils.h> -#include <gvfsjobread.h> -#include <gvfsjobseekread.h> #include <gvfsjobcloseread.h> +#include <gvfsjobclosewrite.h> static void g_vfs_channel_job_source_iface_init (GVfsJobSourceIface *iface); @@ -208,7 +207,7 @@ static void g_vfs_channel_connection_closed (GVfsChannel *channel) { GVfsChannelClass *class; - + if (channel->priv->connection_closed) return; channel->priv->connection_closed = TRUE; @@ -249,8 +248,6 @@ got_request (GVfsChannel *channel, arg2 = g_ntohl (request->arg2); seq_nr = g_ntohl (request->seq_nr); - g_print ("got_command %d %d %d %d\n", command, seq_nr, arg1, arg2); - job = NULL; if (channel->priv->current_job != NULL) @@ -459,8 +456,6 @@ send_reply_cb (GOutputStream *output_stream, GVfsChannelClass *class; GVfsJob *job; - g_print ("send_reply_cb: %d\n", bytes_written); - if (bytes_written <= 0) { g_vfs_channel_connection_closed (channel); @@ -509,7 +504,8 @@ send_reply_cb (GOutputStream *output_stream, channel->priv->current_job = NULL; g_vfs_job_emit_finished (job); - if (G_IS_VFS_JOB_CLOSE_READ (job)) + if (G_IS_VFS_JOB_CLOSE_READ (job) || + G_IS_VFS_JOB_CLOSE_WRITE (job)) { g_vfs_job_source_closed (G_VFS_JOB_SOURCE (channel)); channel->priv->backend_handle = NULL; @@ -517,7 +513,7 @@ send_reply_cb (GOutputStream *output_stream, else if (channel->priv->connection_closed) { class = G_VFS_CHANNEL_GET_CLASS (channel); - + channel->priv->current_job = class->close (channel); channel->priv->current_job_seq_nr = 0; g_vfs_job_source_new_job (G_VFS_JOB_SOURCE (channel), channel->priv->current_job); |