From 4865d1edd222a3553e80ac9706fbf55d361cdff1 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 2 Sep 2016 14:01:44 +0200 Subject: [PATCH] common: Export flatpak_run_add_app_info_args We want to use this from flatpak build too --- common/flatpak-run.c | 18 +++++++++--------- common/flatpak-run.h | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index f90852cb..66acfd7a 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -2406,14 +2406,14 @@ compute_permissions (GKeyFile *app_metadata, return g_steal_pointer (&app_context); } -static gboolean -add_app_info_args (GPtrArray *argv_array, - GArray *fd_array, - GFile *app_files, - const char *app_id, - const char *runtime_ref, - FlatpakContext *final_app_context, - GError **error) +gboolean +flatpak_run_add_app_info_args (GPtrArray *argv_array, + GArray *fd_array, + GFile *app_files, + const char *app_id, + const char *runtime_ref, + FlatpakContext *final_app_context, + GError **error) { g_autofree char *tmp_path = NULL; int fd; @@ -3190,7 +3190,7 @@ flatpak_run_app (const char *app_ref, if (!flatpak_run_setup_base_argv (argv_array, fd_array, runtime_files, app_id_dir, app_ref_parts[2], flags, error)) return FALSE; - if (!add_app_info_args (argv_array, fd_array, app_files, app_ref_parts[1], runtime_ref, app_context, error)) + if (!flatpak_run_add_app_info_args (argv_array, fd_array, app_files, app_ref_parts[1], runtime_ref, app_context, error)) return FALSE; if (!flatpak_run_add_extension_args (argv_array, metakey, app_ref, cancellable, error)) diff --git a/common/flatpak-run.h b/common/flatpak-run.h index 0dfddf73..867f0a08 100644 --- a/common/flatpak-run.h +++ b/common/flatpak-run.h @@ -107,6 +107,14 @@ gboolean flatpak_run_setup_base_argv (GPtrArray *argv_array, const char *arch, FlatpakRunFlags flags, GError **error); +gboolean flatpak_run_add_app_info_args (GPtrArray *argv_array, + GArray *fd_array, + GFile *app_files, + const char *app_id, + const char *runtime_ref, + FlatpakContext *final_app_context, + GError **error); + gboolean flatpak_run_app (const char *app_ref, FlatpakDeploy *app_deploy, FlatpakContext *extra_context,