luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +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

8
gio/gfileenumerator.c
View File

@@ -166,14 +166,14 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator,
class = G_FILE_ENUMERATOR_GET_CLASS (enumerator);
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE;
info = (* class->next_file) (enumerator, cancellable, error);
enumerator->priv->pending = FALSE;
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
return info;
}
@@ -216,7 +216,7 @@ g_file_enumerator_close (GFileEnumerator *enumerator,
}
if (cancellable)
g_push_current_cancellable (cancellable);
g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE;
(* class->close_fn) (enumerator, cancellable, error);
@@ -224,7 +224,7 @@ g_file_enumerator_close (GFileEnumerator *enumerator,
enumerator->priv->closed = TRUE;
if (cancellable)
g_pop_current_cancellable (cancellable);
g_cancellable_pop_current (cancellable);
return TRUE;
}