Commit 1578d0d1 authored by Christian Hergert's avatar Christian Hergert
Browse files

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.
parent 0ad37746
......@@ -184,11 +184,6 @@ struct _IdeBuildPipeline
*/
guint seqnum;
/*
* If GInitableIface.init has been called.
*/
guint initialized : 1;
/*
* If we failed to build, this should be set.
*/
......@@ -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);
}
......@@ -1272,15 +1258,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.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment