From 6b9dbd9faaee3b20224e6afc00a7b8669038eae5 Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Sun, 8 Dec 2013 18:02:25 +0000
Subject: [PATCH] Long term fix for wrong version number part of bug 639371

Read compile time version number to display in the report

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23519 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/core-utils/core-utils.i                       | 6 ++++++
 src/core-utils/core-utils.scm                     | 2 ++
 src/report/locale-specific/us/taxtxf-de_DE.scm    | 1 +
 src/report/locale-specific/us/taxtxf.scm          | 1 +
 src/report/utility-reports/welcome-to-gnucash.scm | 7 ++++---
 src/scm/main.scm                                  | 2 --
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/core-utils/core-utils.i b/src/core-utils/core-utils.i
index 502d5544d5..7180934f42 100644
--- a/src/core-utils/core-utils.i
+++ b/src/core-utils/core-utils.i
@@ -1,11 +1,13 @@
 %module sw_core_utils
 %{
+#include <config.h>
 #include <gnc-glib-utils.h>
 #include <gnc-prefs.h>
 #include <gnc-path.h>
 #include <gnc-filepath-utils.h>
 #include <gnc-locale-utils.h>
 #include <glib.h>
+const gchar *gnc_version(void);
 %}
 #if defined(SWIGGUILE)
 %{
@@ -26,6 +28,10 @@ void
 %import "base-typemaps.i"
 
 %include <gnc-prefs.h>
+%inline %{
+const gchar *gnc_version(void)
+{ return VERSION; }
+%}
 
 %newobject gnc_path_get_bindir;
 gchar * gnc_path_get_bindir(void);
diff --git a/src/core-utils/core-utils.scm b/src/core-utils/core-utils.scm
index e251b27c98..8e45e3c804 100644
--- a/src/core-utils/core-utils.scm
+++ b/src/core-utils/core-utils.scm
@@ -41,3 +41,5 @@
 (re-export gnc-prefs-set-float)
 (re-export gnc-prefs-set-string)
 (re-export gnc-prefs-set-coords)
+
+(define-public gnc:version (gnc-version))
diff --git a/src/report/locale-specific/us/taxtxf-de_DE.scm b/src/report/locale-specific/us/taxtxf-de_DE.scm
index c9f5aef07e..1eb130b470 100644
--- a/src/report/locale-specific/us/taxtxf-de_DE.scm
+++ b/src/report/locale-specific/us/taxtxf-de_DE.scm
@@ -51,6 +51,7 @@
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
 (use-modules (srfi srfi-1))
 (use-modules (gnucash printf))
+(use-modules (gnucash core-utils)) ; for gnc:version
 
 (use-modules (gnucash gnc-module))
 (gnc:module-load "gnucash/tax/de_DE" 0)
diff --git a/src/report/locale-specific/us/taxtxf.scm b/src/report/locale-specific/us/taxtxf.scm
index f96e36c1b1..302d5d2664 100644
--- a/src/report/locale-specific/us/taxtxf.scm
+++ b/src/report/locale-specific/us/taxtxf.scm
@@ -79,6 +79,7 @@
 (use-modules (sw_gnome_utils)) ;; to get to gnc-error-dialog
 
 (use-modules (gnucash printf))
+(use-modules (gnucash core-utils)) ; for gnc:version
 
 (gnc:module-load "gnucash/html" 0)   ; added for 'gnc-html-engine-supports-css'
 (gnc:module-load "gnucash/tax/us" 0)
diff --git a/src/report/utility-reports/welcome-to-gnucash.scm b/src/report/utility-reports/welcome-to-gnucash.scm
index 1cb4ce3916..9897acbafd 100644
--- a/src/report/utility-reports/welcome-to-gnucash.scm
+++ b/src/report/utility-reports/welcome-to-gnucash.scm
@@ -24,6 +24,7 @@
 (export gnc:make-welcome-report)
 
 (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing.
+(use-modules (gnucash core-utils)) ; for gnc:version
 (use-modules (gnucash gnc-module))
 (use-modules (sw_report_system))
 
@@ -86,9 +87,9 @@
     (gnc:html-document-add-object! 
      doc
      (gnc:make-html-text 
-      (gnc:html-markup-h2 (_ "Welcome to GnuCash 2.4!"))
-      (gnc:html-markup-p
-       (_ "GnuCash 2.4 has lots of nice features. Here are a few."))))
+      (gnc:html-markup-h2 (format (_ "Welcome to GnuCash ~a !") gnc:version))
+      (gnc:html-markup-p (format
+       (_ "GnuCash ~a has lots of nice features. Here are a few.") gnc:version))))
     doc))
 
 (gnc:define-report 
diff --git a/src/scm/main.scm b/src/scm/main.scm
index b40e3bca4b..a4387125b2 100644
--- a/src/scm/main.scm
+++ b/src/scm/main.scm
@@ -49,7 +49,6 @@
 ;; Exports
 
 ;; from main.scm
-(export gnc:version)
 (export gnc:warn)
 (export gnc:error)
 (export gnc:msg)
@@ -78,7 +77,6 @@
 
 ;;(use-modules (ice-9 statprof))
 
-
 ;; various utilities
 
 (define (gnc:safe-strcmp a b)