[gnome-builder/wip/chergert/pipeline-merge: 70/76] flatpak: Fix formatting

[Christian Hergert <chergert src gnome org>]

commit 9ad2ff63987b676a13ca37052fd5463575eea575
Author: Matthew Leeds <mleeds redhat com>
Date:   Mon Feb 6 16:57:40 2017 -0600

    flatpak: Fix formatting

 plugins/flatpak/gbp-flatpak-configuration.c |    3 +-
 plugins/flatpak/gbp-flatpak-configuration.h |    2 +-
 plugins/flatpak/gbp-flatpak-runtime.c       |   33 ++++++++++++++-------------
 3 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/plugins/flatpak/gbp-flatpak-configuration.c b/plugins/flatpak/gbp-flatpak-configuration.c
index 05bf636..cd4405e 100644
--- a/plugins/flatpak/gbp-flatpak-configuration.c
+++ b/plugins/flatpak/gbp-flatpak-configuration.c
@@ -42,7 +42,8 @@ enum {
 
 static GParamSpec *properties [N_PROPS];
 
-GFile *gbp_flatpak_configuration_get_manifest (GbpFlatpakConfiguration *self)
+GFile *
+gbp_flatpak_configuration_get_manifest (GbpFlatpakConfiguration *self)
 {
   g_return_val_if_fail (GBP_IS_FLATPAK_CONFIGURATION (self), NULL);
 
diff --git a/plugins/flatpak/gbp-flatpak-configuration.h b/plugins/flatpak/gbp-flatpak-configuration.h
index 1cb116a..a0959a6 100644
--- a/plugins/flatpak/gbp-flatpak-configuration.h
+++ b/plugins/flatpak/gbp-flatpak-configuration.h
@@ -27,7 +27,7 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (GbpFlatpakConfiguration, gbp_flatpak_configuration, GBP, FLATPAK_CONFIGURATION, 
IdeConfiguration)
 
-GFile       *gbp_flatpak_configuration_get_manifest (GbpFlatpakConfiguration *self);
+GFile       *gbp_flatpak_configuration_get_manifest       (GbpFlatpakConfiguration *self);
 const gchar *gbp_flatpak_configuration_get_primary_module (GbpFlatpakConfiguration *self);
 void         gbp_flatpak_configuration_set_primary_module (GbpFlatpakConfiguration *self,
                                                            const gchar *primary_module);
diff --git a/plugins/flatpak/gbp-flatpak-runtime.c b/plugins/flatpak/gbp-flatpak-runtime.c
index cf5624b..bc1b577 100644
--- a/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/plugins/flatpak/gbp-flatpak-runtime.c
@@ -51,6 +51,18 @@ enum {
 
 static GParamSpec *properties [N_PROPS];
 
+static const gchar *
+get_builddir (GbpFlatpakRuntime *self)
+{
+  IdeContext *context = ide_object_get_context (IDE_OBJECT (self));
+  IdeBuildManager *build_manager = ide_context_get_build_manager (context);
+  IdeBuildPipeline *pipeline = ide_build_manager_get_pipeline (build_manager);
+  const gchar *builddir = ide_build_pipeline_get_builddir (pipeline);
+
+  return builddir;
+}
+
+
 static gchar *
 get_staging_directory (GbpFlatpakRuntime *self)
 {
@@ -99,17 +111,6 @@ gbp_flatpak_runtime_contains_program_in_path (IdeRuntime   *runtime,
   return FALSE;
 }
 
-static const gchar *
-get_builddir (GbpFlatpakRuntime *self)
-{
-  IdeContext *context = ide_object_get_context (IDE_OBJECT (self));
-  IdeBuildManager *build_manager = ide_context_get_build_manager (context);
-  IdeBuildPipeline *pipeline = ide_build_manager_get_pipeline (build_manager);
-  const gchar *builddir = ide_build_pipeline_get_builddir (pipeline);
-
-  return builddir;
-}
-
 static IdeSubprocessLauncher *
 gbp_flatpak_runtime_create_launcher (IdeRuntime  *runtime,
                                      GError     **error)
@@ -139,17 +140,17 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime  *runtime,
       IdeConfigurationManager *config_manager;
       IdeConfiguration *configuration;
 
-      build_path = get_staging_directory (self);
-      builddir = get_builddir (self);
-
       context = ide_object_get_context (IDE_OBJECT (self));
       config_manager = ide_context_get_configuration_manager (context);
       configuration = ide_configuration_manager_get_current (config_manager);
 
+      build_path = get_staging_directory (self);
+      builddir = get_builddir (self);
+
       /* Attempt to parse the flatpak manifest */
       if (GBP_IS_FLATPAK_CONFIGURATION (configuration) &&
-          (manifest = gbp_flatpak_configuration_get_manifest ((GbpFlatpakConfiguration *)configuration)) &&
-          (manifest_path = g_file_get_path (manifest)))
+          NULL != (manifest = gbp_flatpak_configuration_get_manifest (GBP_FLATPAK_CONFIGURATION 
(configuration))) &&
+          NULL != (manifest_path = g_file_get_path (manifest)))
         {
           GError *json_error = NULL;
           JsonObject *root_object;