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
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

View File

@@ -156,10 +156,10 @@ io_job_thread (gpointer data,
GIOJob *job = data;
if (job->cancellable)
g_push_current_cancellable (job->cancellable);
g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data);
if (job->cancellable)
g_pop_current_cancellable (job->cancellable);
g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify)
job->destroy_notify (job->data);
@@ -175,12 +175,12 @@ run_job_at_idle (gpointer data)
GIOJob *job = data;
if (job->cancellable)
g_push_current_cancellable (job->cancellable);
g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data);
if (job->cancellable)
g_pop_current_cancellable (job->cancellable);
g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify)
job->destroy_notify (job->data);