diff options
| author | Burt P <pburt0@gmail.com> | 2018-10-24 00:41:16 -0500 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2018-11-04 15:02:27 -0800 |
| commit | f6299d9fad21c065d1e4c0f1093770835fb73adf (patch) | |
| tree | b0cd1293efe336e40c0dc804fc1aa15285368b4d /hardinfo | |
| parent | 81026a56d57b3e8ee00f2f43003a90cde30664f3 (diff) | |
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 <pburt0@gmail.com>
Diffstat (limited to 'hardinfo')
| -rw-r--r-- | hardinfo/hardinfo.c | 18 | ||||
| -rw-r--r-- | hardinfo/util.c | 4 |
2 files changed, 13 insertions, 9 deletions
diff --git a/hardinfo/hardinfo.c b/hardinfo/hardinfo.c index e1783315..d1d228b3 100644 --- a/hardinfo/hardinfo.c +++ b/hardinfo/hardinfo.c @@ -92,13 +92,17 @@ int main(int argc, char **argv) } if (!params.create_report && !params.run_benchmark) { - /* we only try to open the UI if the user didn't ask for a report. */ - params.gui_running = ui_init(&argc, &argv); - - /* as a fallback, if GTK+ initialization failed, run in report - generation mode. */ - if (!params.gui_running) - params.create_report = TRUE; + /* we only try to open the UI if the user didn't ask for a report. */ + params.gui_running = ui_init(&argc, &argv); + + /* as a fallback, if GTK+ initialization failed, run in report + generation mode. */ + if (!params.gui_running) { + params.create_report = TRUE; + /* ... it is possible to -f html without -r */ + if (params.report_format != REPORT_FORMAT_HTML) + params.markup_ok = FALSE; + } } if (params.use_modules) { 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)) { |