From 402e2020d828a73b0197954628108cb3232c8663 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Dec 2018 01:55:20 -0500 Subject: [PATCH] Add a way to force fancy output on This will be used for testing the table printer formatting. Closes: #2498 Approved by: matthiasclasen --- common/flatpak-utils-private.h | 1 + common/flatpak-utils.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/common/flatpak-utils-private.h b/common/flatpak-utils-private.h index 9c9e2077..5a692eda 100644 --- a/common/flatpak-utils-private.h +++ b/common/flatpak-utils-private.h @@ -91,6 +91,7 @@ const char * flatpak_path_match_prefix (const char *pattern, const char *path); void flatpak_disable_fancy_output (void); +void flatpak_enable_fancy_output (void); gboolean flatpak_fancy_output (void); const char * flatpak_get_arch (void); diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c index b032762f..23b672b5 100644 --- a/common/flatpak-utils.c +++ b/common/flatpak-utils.c @@ -591,19 +591,25 @@ flatpak_get_gtk_theme (void) return (const char *) gtk_theme; } -static gboolean no_fancy_output; +static int fancy_output = -1; void flatpak_disable_fancy_output (void) { - no_fancy_output = TRUE; + fancy_output = FALSE; +} + +void +flatpak_enable_fancy_output (void) +{ + fancy_output = TRUE; } gboolean flatpak_fancy_output (void) { - if (no_fancy_output) - return FALSE; + if (fancy_output != -1) + return fancy_output; if (g_strcmp0 (g_getenv ("FLATPAK_FANCY_OUTPUT"), "0") == 0) return FALSE;