old/new version display
authorPaul <paul@claws-mail.org>
Sun, 2 Apr 2017 09:08:38 +0000 (10:08 +0100)
committerPaul <paul@claws-mail.org>
Sun, 2 Apr 2017 09:08:38 +0000 (10:08 +0100)
src/common/version.h.in
src/gtk/about.c
src/main.c

index 957a5cd..c441b6f 100644 (file)
@@ -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
index ad6d100..890e2d7 100644 (file)
@@ -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
                ("<span weight=\"bold\" size=\"xx-large\">Claws Mail</span>\nversion %s",
-                VERSION_GIT_FULL);
+                VERSION);
        gtk_label_set_markup(GTK_LABEL(label), markup);
        g_free(markup);
 
index 83ea2e6..331f7e0 100644 (file)
@@ -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) ||