[gnome-builder/gnome-builder-3-24] runmanager: cleanup error handling

[Christian Hergert <chergert src gnome org>]

commit a830a7b04246b7fd7439ca5908b52a59405d777f
Author: Christian Hergert <chergert redhat com>
Date:   Thu Apr 6 17:06:24 2017 -0700

    runmanager: cleanup error handling
    
    I prefer we have explicity ownership transfer using g_steal_pointer() so
    that it is easy to grep for misuse in the code-base.

 libide/runner/ide-run-manager.c |   37 +++++++++++++++++++++----------------
 1 files changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/libide/runner/ide-run-manager.c b/libide/runner/ide-run-manager.c
index c5d7ad4..6fe1777 100644
--- a/libide/runner/ide-run-manager.c
+++ b/libide/runner/ide-run-manager.c
@@ -265,8 +265,8 @@ ide_run_manager_run_cb (GObject      *object,
 {
   IdeRunner *runner = (IdeRunner *)object;
   g_autoptr(GTask) task = user_data;
+  g_autoptr(GError) error = NULL;
   IdeRunManager *self;
-  GError *error = NULL;
 
   IDE_ENTRY;
 
@@ -276,14 +276,9 @@ ide_run_manager_run_cb (GObject      *object,
   self = g_task_get_source_object (task);
 
   if (!ide_runner_run_finish (runner, result, &error))
-    {
-      g_task_return_error (task, error);
-      IDE_GOTO (failure);
-    }
-
-  g_task_return_boolean (task, TRUE);
-
-failure:
+    g_task_return_error (task, g_steal_pointer (&error));
+  else
+    g_task_return_boolean (task, TRUE);
 
   g_signal_emit (self, signals [STOPPED], 0);
 
@@ -355,7 +350,9 @@ ide_run_manager_run_discover_cb (GObject      *object,
   IdeRunManager *self = (IdeRunManager *)object;
   g_autoptr(IdeBuildTarget) build_target = NULL;
   g_autoptr(GTask) task = user_data;
-  GError *error = NULL;
+  g_autoptr(GError) error = NULL;
+
+  IDE_ENTRY;
 
   g_assert (IDE_IS_RUN_MANAGER (self));
   g_assert (G_IS_ASYNC_RESULT (result));
@@ -364,8 +361,8 @@ ide_run_manager_run_discover_cb (GObject      *object,
 
   if (build_target == NULL)
     {
-      g_task_return_error (task, error);
-      return;
+      g_task_return_error (task, g_steal_pointer (&error));
+      IDE_EXIT;
     }
 
   ide_run_manager_set_build_target (self, build_target);
@@ -373,6 +370,8 @@ ide_run_manager_run_discover_cb (GObject      *object,
   g_task_set_task_data (task, g_steal_pointer (&build_target), g_object_unref);
 
   do_run_async (self, task);
+
+  IDE_EXIT;
 }
 
 static void
@@ -418,6 +417,8 @@ ide_run_manager_install_cb (GObject      *object,
   g_task_set_task_data (task, g_object_ref (build_target), g_object_unref);
 
   do_run_async (self, g_steal_pointer (&task));
+
+  IDE_EXIT;
 }
 
 static void
@@ -456,6 +457,8 @@ ide_run_manager_do_install_before_run (IdeRunManager *self,
   IdeBuildManager *build_manager;
   IdeContext *context;
 
+  IDE_ENTRY;
+
   g_assert (IDE_IS_RUN_MANAGER (self));
   g_assert (G_IS_TASK (task));
 
@@ -482,6 +485,8 @@ ide_run_manager_do_install_before_run (IdeRunManager *self,
                                    g_object_ref (task));
 
   ide_run_manager_notify_busy (self);
+
+  IDE_EXIT;
 }
 
 void
@@ -493,7 +498,7 @@ ide_run_manager_run_async (IdeRunManager       *self,
 {
   g_autoptr(GTask) task = NULL;
   g_autoptr(GCancellable) local_cancellable = NULL;
-  GError *error = NULL;
+  g_autoptr(GError) error = NULL;
 
   IDE_ENTRY;
 
@@ -511,7 +516,7 @@ ide_run_manager_run_async (IdeRunManager       *self,
 
   if (ide_run_manager_check_busy (self, &error))
     {
-      g_task_return_error (task, error);
+      g_task_return_error (task, g_steal_pointer (&error));
       IDE_EXIT;
     }
 
@@ -726,8 +731,8 @@ ide_run_manager_discover_default_target_cb (GObject      *object,
   IdeBuildSystem *build_system = (IdeBuildSystem *)object;
   g_autoptr(GTask) task = user_data;
   g_autoptr(GPtrArray) targets = NULL;
+  g_autoptr(GError) error = NULL;
   IdeBuildTarget *best_match;
-  GError *error = NULL;
 
   IDE_ENTRY;
 
@@ -738,7 +743,7 @@ ide_run_manager_discover_default_target_cb (GObject      *object,
 
   if (targets == NULL)
     {
-      g_task_return_error (task, error);
+      g_task_return_error (task, g_steal_pointer (&error));
       IDE_EXIT;
     }