diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-12-13 16:48:06 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-12-13 16:48:06 +0000 |
| commit | 2ae689e31f793bfdddaee6d5cb7e679d1adff7a9 (patch) | |
| tree | 0c539c59bebeb993ca7a27262b39f04ad9524c2c /gio/gfileoutputstream.c | |
| parent | f6b9b4f45e2b5e98f8e460815d39b1b014007c1d (diff) | |
| download | glib-2ae689e31f793bfdddaee6d5cb7e679d1adff7a9.tar.gz | |
g_push/pop_current_cancellable -> g_cancellable_push/pop_current
2007-12-13 Alexander Larsson <alexl@redhat.com>
* gcancellable.[ch]:
* gio.symbols:
* gbufferedinputstream.c:
* gfileenumerator.c:
* gfileinputstream.c:
* gfileoutputstream.c:
* ginputstream.c:
* gioscheduler.c:
* goutputstream.c:
g_push/pop_current_cancellable ->
g_cancellable_push/pop_current
svn path=/trunk/; revision=6115
Diffstat (limited to 'gio/gfileoutputstream.c')
| -rw-r--r-- | gio/gfileoutputstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gio/gfileoutputstream.c b/gio/gfileoutputstream.c index 80a15fed0..ba66bdf94 100644 --- a/gio/gfileoutputstream.c +++ b/gio/gfileoutputstream.c @@ -144,7 +144,7 @@ g_file_output_stream_query_info (GFileOutputStream *stream, info = NULL; if (cancellable) - g_push_current_cancellable (cancellable); + g_cancellable_push_current (cancellable); class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream); if (class->query_info) @@ -154,7 +154,7 @@ g_file_output_stream_query_info (GFileOutputStream *stream, _("Stream doesn't support query_info")); if (cancellable) - g_pop_current_cancellable (cancellable); + g_cancellable_pop_current (cancellable); g_output_stream_clear_pending (output_stream); @@ -400,12 +400,12 @@ g_file_output_stream_seek (GFileOutputStream *stream, return FALSE; if (cancellable) - g_push_current_cancellable (cancellable); + g_cancellable_push_current (cancellable); res = class->seek (stream, offset, type, cancellable, error); if (cancellable) - g_pop_current_cancellable (cancellable); + g_cancellable_pop_current (cancellable); g_output_stream_clear_pending (output_stream); @@ -495,12 +495,12 @@ g_file_output_stream_truncate (GFileOutputStream *stream, return FALSE; if (cancellable) - g_push_current_cancellable (cancellable); + g_cancellable_push_current (cancellable); res = class->truncate_fn (stream, size, cancellable, error); if (cancellable) - g_pop_current_cancellable (cancellable); + g_cancellable_pop_current (cancellable); g_output_stream_clear_pending (output_stream); |