From dd09af34b791def2ef370232922d968f5176d1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= Date: Fri, 12 Aug 2022 21:16:37 +0200 Subject: Make binaries say what git commit they come from The manual skipping of the initial "v" from tag names is unfortunate, but still a bit better than further cluttering up the build system. --- fiv.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'fiv.c') diff --git a/fiv.c b/fiv.c index 670661e..d58a5a5 100644 --- a/fiv.c +++ b/fiv.c @@ -450,8 +450,12 @@ show_about_dialog(GtkWidget *parent) // The rest is approximately copying GTK+'s own gtkaboutdialog.ui. GtkWidget *name = gtk_label_new(NULL); gtk_label_set_selectable(GTK_LABEL(name), TRUE); - gtk_label_set_markup( - GTK_LABEL(name), "" PROJECT_NAME " " PROJECT_VERSION); + + const char *version = PROJECT_VERSION; + gchar *markup = g_strdup_printf( + "%s %s", PROJECT_NAME, &version[*version == 'v']); + gtk_label_set_markup(GTK_LABEL(name), markup); + g_free(markup); GtkWidget *website = gtk_label_new(NULL); gtk_label_set_selectable(GTK_LABEL(website), TRUE); @@ -2005,7 +2009,8 @@ main(int argc, char *argv[]) gboolean initialized = gtk_init_with_args( &argc, &argv, " - Image browser and viewer", options, NULL, &error); if (show_version) { - printf(PROJECT_NAME " " PROJECT_VERSION "\n"); + const char *version = PROJECT_VERSION; + printf("%s %s\n", PROJECT_NAME, &version[*version == 'v']); return 0; } if (show_supported_media_types) { -- cgit v1.2.3