From f6299d9fad21c065d1e4c0f1093770835fb73adf Mon Sep 17 00:00:00 2001 From: Burt P Date: Wed, 24 Oct 2018 00:41:16 -0500 Subject: params: html_ok -> markup_ok The html_ok param added in 970174b0897d40b804808632784ffa1544d9da93 is misleading. It turns out that it is not HTML, but Pango Markup that is used by GTK, and a subset of that happens to also work as HTML4 for the HTML report generation. This change renames html_ok to markup_ok in ProgramParameters and adds a comment explaining what common set of tags may be used. Also, if report generation happens as a fallback after GUI initialization failed, then also disable markup, unless report will be generated as HTML. Pango markup info at: https://developer.gnome.org/pango/stable/PangoMarkupFormat.html Signed-off-by: Burt P --- hardinfo/util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hardinfo/util.c') diff --git a/hardinfo/util.c b/hardinfo/util.c index c58e2e1a..4acb28be 100644 --- a/hardinfo/util.c +++ b/hardinfo/util.c @@ -508,9 +508,9 @@ void parameters_init(int *argc, char ***argv, ProgramParameters * param) * report html: yes * report text: no * anything else? */ - param->html_ok = TRUE; + param->markup_ok = TRUE; if (param->create_report && param->report_format != REPORT_FORMAT_HTML) - param->html_ok = FALSE; + param->markup_ok = FALSE; gchar *confdir = g_build_filename(g_get_user_config_dir(), "hardinfo", NULL); if (!g_file_test(confdir, G_FILE_TEST_EXISTS)) { -- cgit v1.2.3