diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 09:42:17 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 09:42:17 +0000 |
| commit | c5ccb75eb87cac16e3ea89a0c54648d435ebf863 (patch) | |
| tree | 4caeac42116df9a5a703c8346838faf8d536628f /programs | |
| parent | 445323913d69e0b2aee7747e2121f6ef0d0298da (diff) | |
Make cancellable explicitly passed to sync ops
Original git commit by Alexander Larsson <alex@localhost.localdomain> at 1163095361 +0100
svn path=/trunk/; revision=144
Diffstat (limited to 'programs')
| -rw-r--r-- | programs/gvfs-cat.c | 4 | ||||
| -rw-r--r-- | programs/gvfs-ls.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/programs/gvfs-cat.c b/programs/gvfs-cat.c index a72edb5e..5e7eea12 100644 --- a/programs/gvfs-cat.c +++ b/programs/gvfs-cat.c @@ -28,7 +28,7 @@ cat (GFile *file) error = NULL; while (1) { - res = g_input_stream_read (in, buffer, 1024, &error); + res = g_input_stream_read (in, buffer, 1024, NULL, &error); if (res > 0) { ssize_t written; @@ -60,7 +60,7 @@ cat (GFile *file) out: - close_res = g_input_stream_close (in, &error); + close_res = g_input_stream_close (in, NULL, &error); if (!close_res) { g_printerr ("Error closing: %s\n", error->message); diff --git a/programs/gvfs-ls.c b/programs/gvfs-ls.c index 81e3605f..a5de397f 100644 --- a/programs/gvfs-ls.c +++ b/programs/gvfs-ls.c @@ -79,7 +79,7 @@ list (GFile *file) enumerator = g_file_enumerate_children (file, request, attributes, TRUE); error = NULL; - while ((info = g_file_enumerator_next_file (enumerator, &error)) != NULL) + while ((info = g_file_enumerator_next_file (enumerator, NULL, &error)) != NULL) { show_info (info); @@ -93,7 +93,7 @@ list (GFile *file) error = NULL; } - if (!g_file_enumerator_stop (enumerator, &error)) + if (!g_file_enumerator_stop (enumerator, NULL, &error)) { g_print ("Error stopping enumerator: %s\n", error->message); g_error_free (error); |