diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 12:24:55 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 12:24:55 +0000 |
| commit | b5a8bd71c75891c27c540fe23ff30ea9807f01dc (patch) | |
| tree | ca2cc42088c6b984cea74c482ba4edb80d9d0c33 /client/gdaemonfileinputstream.c | |
| parent | 43ac643a5bf62d442be8f5b0aecf0fda7ccb8088 (diff) | |
| download | gvfs-b5a8bd71c75891c27c540fe23ff30ea9807f01dc.tar.gz | |
Rename G_VFS_ERROR to G_IO_ERROR
Original git commit by Alexander Larsson <alex@greebo.(none)> at 1174383743 +0100
svn path=/trunk/; revision=405
Diffstat (limited to 'client/gdaemonfileinputstream.c')
| -rw-r--r-- | client/gdaemonfileinputstream.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index eb7a3ad2..89478404 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -12,7 +12,7 @@ #include <glib.h> #include <glib/gstdio.h> #include <glib/gi18n-lib.h> -#include <gio/gvfserror.h> +#include <gio/gioerror.h> #include <gio/gseekable.h> #include "gdaemonfileinputstream.h" #include "gvfsdaemondbus.h" @@ -256,8 +256,8 @@ static gboolean error_is_cancel (GError *error) { return error != NULL && - error->domain == G_VFS_ERROR && - error->code == G_VFS_ERROR_CANCELLED; + error->domain == G_IO_ERROR && + error->code == G_IO_ERROR_CANCELLED; } static void @@ -450,8 +450,8 @@ iterate_read_state_machine (GDaemonFileInputStream *file, IOOperationData *io_op { op->ret_val = -1; g_set_error (&op->ret_error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return STATE_OP_DONE; } @@ -606,8 +606,8 @@ iterate_read_state_machine (GDaemonFileInputStream *file, IOOperationData *io_op { op->ret_val = -1; g_set_error (&op->ret_error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return STATE_OP_DONE; } @@ -651,8 +651,8 @@ g_daemon_file_input_stream_read (GInputStream *stream, if (g_cancellable_is_cancelled (cancellable)) { g_set_error (error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return -1; } @@ -719,8 +719,8 @@ iterate_close_state_machine (GDaemonFileInputStream *file, IOOperationData *io_o { op->ret_val = FALSE; g_set_error (&op->ret_error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return STATE_OP_DONE; } @@ -969,8 +969,8 @@ iterate_seek_state_machine (GDaemonFileInputStream *file, IOOperationData *io_op { op->ret_val = -1; g_set_error (&op->ret_error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return STATE_OP_DONE; } @@ -1145,7 +1145,7 @@ g_daemon_file_input_stream_seek (GFileInputStream *stream, if (!file->can_seek) { - g_set_error (error, G_VFS_ERROR, G_VFS_ERROR_NOT_SUPPORTED, + g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, _("Seek not supported on stream")); return FALSE; } @@ -1153,8 +1153,8 @@ g_daemon_file_input_stream_seek (GFileInputStream *stream, if (g_cancellable_is_cancelled (cancellable)) { g_set_error (error, - G_VFS_ERROR, - G_VFS_ERROR_CANCELLED, + G_IO_ERROR, + G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return FALSE; } |