always show the full version on the mainwindow regardless of --enable-maintainer...

diff --git a/src/common/version.h.in b/src/common/version.h.in
index c441b6f301b9d0cbeb2189dba6a591397e02700a..8b6a0e5036e8138032435105fabbf4dda47ec50e 100644 (file)
--- a/src/common/version.h.in
+++ b/src/common/version.h.in
@@ -1,6 +1,6 @@
 /*
 /*

- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto  and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -28,13 +28,7 @@
 #define PACKAGE                        "@PACKAGE@"
 #define PACKAGE_FRIENDLY       "Claws Mail"
 #define VERSION                        "@VERSION@"
 #define PACKAGE                        "@PACKAGE@"
 #define PACKAGE_FRIENDLY       "Claws Mail"
 #define VERSION                        "@VERSION@"

-#define RELEASE_VERSION                "@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@"

 #define PROG_VERSION           PACKAGE_FRIENDLY" "VERSION
 #define PROG_VERSION           PACKAGE_FRIENDLY" "VERSION

-#ifdef USE_MAINTAINER_MODE
-#define PROG_VERSION_FRIENDLY  PROG_VERSION
-#else
-#define PROG_VERSION_FRIENDLY  PACKAGE_FRIENDLY" "RELEASE_VERSION
-#endif

 #define VERSION_NUMERIC                MAKE_NUMERIC_VERSION(@MAJOR_VERSION@, @MINOR_VERSION@, \
                                                     @MICRO_VERSION@, @EXTRA_VERSION@)
 #define VERSION_GIT_FULL       "@GIT_VERSION@"
 #define VERSION_NUMERIC                MAKE_NUMERIC_VERSION(@MAJOR_VERSION@, @MINOR_VERSION@, \
                                                     @MICRO_VERSION@, @EXTRA_VERSION@)
 #define VERSION_GIT_FULL       "@GIT_VERSION@"

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 8e87c709c6b5500885d5149d6ebb99307bb0d1e0..5259a5d35ace00bc342b05d0dab76e36ba17ca67 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
 /*
    Claws Mail -- a GTK+ based, lightweight, and fast e-mail client

-   Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
+   Copyright (C) 1999-2018 the Claws Mail team and Hiroyuki Yamamoto

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by


@@ -1445,7 +1445,7 @@ MainWindow *main_window_create()
 
        /* main window */
        window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));
 
        /* main window */
        window = GTK_WIDGET(gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow"));

-       gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION_FRIENDLY);
+       gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);

        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #ifdef GENERIC_UMPC
        prefs_common.layout_mode = SMALL_LAYOUT;
        gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
 #ifdef GENERIC_UMPC
        prefs_common.layout_mode = SMALL_LAYOUT;


@@ -2624,9 +2624,9 @@ static void main_window_show_cur_account(MainWindow *mainwin)
                           : _("none"));
 
        if (cur_account)
                           : _("none"));
 
        if (cur_account)

-               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION_FRIENDLY);
+               buf = g_strdup_printf("%s - %s", ac_name, PROG_VERSION);

        else
        else

-               buf = g_strdup(PROG_VERSION_FRIENDLY);
+               buf = g_strdup(PROG_VERSION);

        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);
 
        gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
        g_free(buf);