[gnome-builder/wip/chergert/pipeline-merge] pipeline: reduce initialization checks



commit 1578d0d1402eb6dbb1e1cbe648636d310db44c52
Author: Christian Hergert <chergert redhat com>
Date:   Mon Feb 13 18:27:20 2017 -0800

    pipeline: reduce initialization checks
    
    This ensures that our tests pass again. I'd still like to be more careful
    about deferring this, but this at least fixes tests for the time being.

 libide/buildsystem/ide-build-pipeline.c |   25 +------------------------
 1 files changed, 1 insertions(+), 24 deletions(-)
---
diff --git a/libide/buildsystem/ide-build-pipeline.c b/libide/buildsystem/ide-build-pipeline.c
index 7c43ff2..0153918 100644
--- a/libide/buildsystem/ide-build-pipeline.c
+++ b/libide/buildsystem/ide-build-pipeline.c
@@ -185,11 +185,6 @@ struct _IdeBuildPipeline
   guint seqnum;
 
   /*
-   * If GInitableIface.init has been called.
-   */
-  guint initialized : 1;
-
-  /*
    * If we failed to build, this should be set.
    */
   guint failed : 1;
@@ -776,7 +771,6 @@ ide_build_pipeline_notify_ready (IdeBuildPipeline *self,
   IDE_ENTRY;
 
   g_assert (IDE_IS_BUILD_PIPELINE (self));
-  g_assert (pspec != NULL);
   g_assert (IDE_IS_CONFIGURATION (configuration));
 
   if (ide_configuration_get_ready (configuration))
@@ -839,21 +833,13 @@ ide_build_pipeline_initable_init (GInitable     *initable,
   g_assert (IDE_IS_BUILD_PIPELINE (self));
   g_assert (IDE_IS_CONFIGURATION (self->configuration));
 
-  self->initialized = TRUE;
-
   g_signal_connect_object (self->configuration,
                            "notify::ready",
                            G_CALLBACK (ide_build_pipeline_notify_ready),
                            self,
                            G_CONNECT_SWAPPED);
 
-  if (ide_configuration_get_ready (self->configuration))
-    {
-      ide_build_pipeline_load (self);
-      ide_build_pipeline_queue_flush (self);
-    }
-  else
-    g_message ("Configuration not ready, delaying pipeline setup");
+  ide_build_pipeline_notify_ready (self, NULL, self->configuration);
 
   IDE_RETURN (TRUE);
 }
@@ -1273,15 +1259,6 @@ ide_build_pipeline_do_flush (gpointer data)
   g_assert (IDE_IS_BUILD_PIPELINE (self));
 
   /*
-   * If we have not yet initialized, there is nothing we can do.
-   */
-  if (!self->initialized)
-    {
-      IDE_TRACE_MSG ("Not initialized, deferring flush");
-      IDE_RETURN (G_SOURCE_REMOVE);
-    }
-
-  /*
    * If the busy bit is set, there is nothing to do right now.
    */
   if (self->busy)


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