luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-30 13:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_push/pop_current_cancellable -> g_cancellable_push/pop_current

Browse Source 
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
This commit is contained in:
Alexander Larsson
2007-12-13 16:48:06 +00:00
committed by Alexander Larsson
parent f6b9b4f45e
commit 2ae689e31f
11 changed files with 58 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gio/goutputstream.c
View File

@@ -207,12 +207,12 @@ g_output_stream_write (GOutputStream *stream,
return -1;
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
res = class->write_fn (stream, buffer, count, cancellable, error);
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream);
@@ -318,12 +318,12 @@ g_output_stream_flush (GOutputStream *stream,
if (class->flush)
{
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
res = class->flush (stream, cancellable, error);
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
}
g_output_stream_clear_pending (stream);
@@ -371,12 +371,12 @@ g_output_stream_splice (GOutputStream *stream,
res = TRUE;
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
res = class->splice (stream, source, flags, cancellable, error);
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream);
@@ -516,7 +516,7 @@ g_output_stream_close (GOutputStream *stream,
return FALSE;
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
if (class->flush)
res = class->flush (stream, cancellable, error);
@@ -539,7 +539,7 @@ g_output_stream_close (GOutputStream *stream,
}
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
stream->priv->closed = TRUE;
g_output_stream_clear_pending (stream);