From 6aecd1768d5e9898203d35b31e1137983b760888 Mon Sep 17 00:00:00 2001 From: Paul Date: Sun, 2 Apr 2017 10:08:38 +0100 Subject: [PATCH] old/new version display --- src/common/version.h.in | 2 +- src/gtk/about.c | 2 +- src/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/version.h.in b/src/common/version.h.in index 957a5cd9d..c441b6f30 100644 --- a/src/common/version.h.in +++ b/src/common/version.h.in @@ -29,7 +29,7 @@ #define PACKAGE_FRIENDLY "Claws Mail" #define VERSION "@VERSION@" #define RELEASE_VERSION "@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@" -#define PROG_VERSION PACKAGE_FRIENDLY" "VERSION_GIT_FULL +#define PROG_VERSION PACKAGE_FRIENDLY" "VERSION #ifdef USE_MAINTAINER_MODE #define PROG_VERSION_FRIENDLY PROG_VERSION #else diff --git a/src/gtk/about.c b/src/gtk/about.c index ad6d10031..890e2d7f2 100644 --- a/src/gtk/about.c +++ b/src/gtk/about.c @@ -839,7 +839,7 @@ static void about_create(void) gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0); markup = g_markup_printf_escaped ("Claws Mail\nversion %s", - VERSION_GIT_FULL); + VERSION); gtk_label_set_markup(GTK_LABEL(label), markup); g_free(markup); diff --git a/src/main.c b/src/main.c index 83ea2e679..331f7e0a9 100644 --- a/src/main.c +++ b/src/main.c @@ -1888,7 +1888,7 @@ static void parse_cmd_opt(int argc, char *argv[]) cmd.send = TRUE; } else if (!strncmp(argv[i], "--version-full", 14) || !strncmp(argv[i], "-V", 2)) { - g_print("Claws Mail version " VERSION "\n"); + g_print("Claws Mail version " VERSION_GIT_FULL "\n"); main_dump_features_list(FALSE); exit(0); } else if (!strncmp(argv[i], "--version", 9) || -- 2.25.1