[gnome-builder] pipeline: simplify cancellation chaining



commit 7ca24dcda1cf4a6bf9b094e3c21f904a92684670
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jan 16 00:45:09 2018 -0800

    pipeline: simplify cancellation chaining
    
    We don't need a local cancellable.

 src/libide/buildsystem/ide-build-pipeline.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/src/libide/buildsystem/ide-build-pipeline.c b/src/libide/buildsystem/ide-build-pipeline.c
index 90149b0db..75a428598 100644
--- a/src/libide/buildsystem/ide-build-pipeline.c
+++ b/src/libide/buildsystem/ide-build-pipeline.c
@@ -2992,7 +2992,6 @@ ide_build_pipeline_rebuild_async (IdeBuildPipeline    *self,
                                   gpointer             user_data)
 {
   g_autoptr(GTask) task = NULL;
-  g_autoptr(GCancellable) local_cancellable = NULL;
   TaskData *td;
 
   IDE_ENTRY;
@@ -3001,15 +3000,12 @@ ide_build_pipeline_rebuild_async (IdeBuildPipeline    *self,
   g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
   g_return_if_fail ((phase & ~IDE_BUILD_PHASE_MASK) == 0);
 
-  if (cancellable == NULL)
-    cancellable = local_cancellable = g_cancellable_new ();
+  cancellable = dzl_cancellable_chain (cancellable, self->cancellable);
 
   task = g_task_new (self, cancellable, callback, user_data);
   g_task_set_priority (task, G_PRIORITY_LOW);
   g_task_set_source_tag (task, ide_build_pipeline_rebuild_async);
 
-  dzl_cancellable_chain (cancellable, self->cancellable);
-
   td = task_data_new (task, TASK_REBUILD);
   td->phase = phase;
   g_task_set_task_data (task, td, task_data_free);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]