From e7dd39f9d227c5507e3789b18c7385bd3ea3cb8c Mon Sep 17 00:00:00 2001 From: Burt P Date: Fri, 27 Dec 2019 18:39:46 -0600 Subject: fmt_opts param for pango/html/text formatting Signed-off-by: Burt P --- shell/report.c | 5 +++++ shell/shell.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/report.c b/shell/report.c index 5bb60e0d..cbe4b4d6 100644 --- a/shell/report.c +++ b/shell/report.c @@ -929,6 +929,9 @@ static gboolean report_generate(ReportDialog * rd) gchar *file; FILE *stream; + int old_fmt_opts = params.fmt_opts; + params.fmt_opts = FMT_OPT_NONE; // FIXME: FMT_OPT_HTML for HTML + if (!(file = report_get_filename())) return FALSE; @@ -943,6 +946,7 @@ static gboolean report_generate(ReportDialog * rd) g_warning(_("Cannot create ReportContext. Programming bug?")); g_free(file); fclose(stream); + params.fmt_opts = old_fmt_opts; return FALSE; } @@ -984,6 +988,7 @@ static gboolean report_generate(ReportDialog * rd) report_context_free(ctx); g_free(file); + params.fmt_opts = old_fmt_opts; return TRUE; } diff --git a/shell/shell.c b/shell/shell.c index 3ece6a84..9f31b80f 100644 --- a/shell/shell.c +++ b/shell/shell.c @@ -747,6 +747,7 @@ void shell_init(GSList * modules) DEBUG("initializing shell"); uri_set_function(hardinfo_link); + params.fmt_opts = FMT_OPT_PANGO; create_window(); @@ -1524,8 +1525,6 @@ static gboolean detail_activate_link (GtkLabel *label, gchar *uri, gpointer user return uri_open(uri); } -#include "format_early.h" - static gchar *vendor_info_markup(const Vendor *v) { if (!v) return NULL; gchar *ven_mt = NULL; -- cgit v1.2.3